debian/0000775000000000000000000000000012266311306007170 5ustar debian/copyright0000664000000000000000000000035511616205362011130 0ustar This package was debianized by Christophe Prud'homme prudhomm@mit.edu on Mon, 4 Feb 2002 19:50:51 -0500. It was downloaded from http://ljk.imag.fr/membres/Christophe.Prudhomme/software.php#arpackpp Copyright: public domain software. debian/libarpack++2c2a.install0000664000000000000000000000004411616205362013306 0ustar debian/tmp/usr/lib/libarpack++.so.* debian/changelog0000664000000000000000000001165512266310700011047 0ustar arpack++ (2.3-2ubuntu1) trusty; urgency=low * Use dh-autoreconf, resolving FTBFS (Closes: #713300) (LP: #1229528) -- Daniel T Chen Fri, 17 Jan 2014 15:24:16 -0500 arpack++ (2.3-2) unstable; urgency=low * Team upload * Package moved to debian science * Standards-Version updated to version 3.9.2 * Codes with "arlsmat.h" could not be compiled. Thanks to Konstantinos Poulios for the patch (Closes: #508744) * Switch to dpkg-source 3.0 (quilt) format * spelling-error-in-description fixed: correponding => corresponding * outdated-autotools-helper-file fixed => autoreconf * debhelper-but-no-misc-depends fixed -- Sylvestre Ledru Wed, 03 Aug 2011 10:29:30 +0200 arpack++ (2.3-1) unstable; urgency=low [ Christophe Prud'homme ] * New upstream release * debian/control: update Standards-Version to 3.7.3, no changes * debian/control: removed XS- prefix * upstream is now hosted on gforge.imag.fr * Fixed "please update to use gfortran based lapack, blas", thanks to Kumar Appaiah (Closes: #463931). -- Christophe Prud'homme Fri, 14 Mar 2008 08:40:55 +0100 arpack++ (2.2-10) unstable; urgency=low [ Christophe Prud'homme ] * updated autotools files [ Rafael Laboissiere ] * debian/control: Added XS-Vcs-Svn and XS-Vcs-Browser fields to the Source section -- Christophe Prud'homme Tue, 29 May 2007 22:51:04 +0200 arpack++ (2.2-9) unstable; urgency=low * Fixed miscompiles on amd64 with rpath /usr/lib64, thanks to Goswin von Brederlow (closes: #378210) -- Christophe Prud'homme Sun, 16 Jul 2006 12:56:13 +0200 arpack++ (2.2-8) unstable; urgency=low * Updated to Standards-Version 3.7.2(no change) * Updated Maintainer and Uploaders field * Fixed FTBFS with GCC 4.2: C/C++ linkage declarations conflict (closes: #377103) -- Christophe Prud'homme Fri, 7 Jul 2006 15:11:17 +0200 arpack++ (2.2-7) unstable; urgency=low * g++/libstdc++ new allocator transition * use my debian email address -- Christophe Prud'homme Sun, 20 Nov 2005 17:26:49 +0100 arpack++ (2.2-6) unstable; urgency=low * Build-Depends on refblas-3dev and lapack3-dev -- Christophe Prud'homme Fri, 15 Jul 2005 07:45:34 +0200 arpack++ (2.2-5) unstable; urgency=low * Change Build-Depends for blas and lapack -- Christophe Prud'homme Fri, 15 Jul 2005 00:01:33 +0200 arpack++ (2.2-4) unstable; urgency=low * g++-4.0 transition: libarpack++2 -> libarpack++2c2 * Update Standards-Version to 3.6.2 (no changes) * Changed Build-Depends blas-dev to refblas3-dev -- Christophe Prud'homme Sun, 10 Jul 2005 09:30:57 +0200 arpack++ (2.2-3) unstable; urgency=low * really fix build-depends * FTBFS: Missing Build-Depends on 'libg2c0-dev, blas-dev, lapack3-dev, libarpack2-dev' (closes: #302032) * FTBFS: you need blas (closes: #302094) -- Christophe Prud'homme Wed, 30 Mar 2005 08:19:00 +0200 arpack++ (2.2-2) unstable; urgency=low * Fix build dependencies -- Christophe Prud'homme Tue, 29 Mar 2005 20:44:21 +0200 arpack++ (2.2-1) unstable; urgency=low * Fixed all examples, autotools-ified, added testsuite * arpack++: fails to comple simple.cc example given in "nonsym" examples directory (closes: #300168) -- Christophe Prud'homme Fri, 25 Mar 2005 15:25:10 +0100 arpack++ (2.1-6) unstable; urgency=low * patch applied to get rid of multiple symbols at link time when used certain compilation options (like -g) * follow standard naming conventions: renamed to libarpack++ and libarpac++-dev * update build-depends on debhelper * make -f Makefile.cvs not called in rules anymore -- Christophe Prud'homme Tue, 9 Dec 2003 09:15:21 +0100 arpack++ (2.1-5) unstable; urgency=low * update Standards-Version * depends on libarpack2-dev -- Christophe Prud'homme Fri, 24 Oct 2003 12:43:31 +0200 arpack++ (2.1-4) unstable; urgency=low * ported to new C++ compiler g++3.2(removed all warnings) * arcomplex is complex at all times (closes: 152567) -- Christophe Prud'homme Wed, 28 Aug 2002 09:06:21 -0400 arpack++ (2.1-3) unstable; urgency=low * some compilation patch/fix applied * now touch in debian rules the README files with bad timestamps, that should fix the problem for all archs(not only i386) (closes: #134490) -- Christophe Prud'homme Thu, 7 Mar 2002 23:11:12 -0500 arpack++ (2.1-2) unstable; urgency=low * touched two files (README) to correct timestamps -- 1945 -- problem (closes: #134490) -- Christophe Prud'homme Sun, 17 Feb 2002 22:53:31 -0500 arpack++ (2.1-1) unstable; urgency=low * Initial release. -- Christophe Prud'homme Mon, 4 Feb 2002 20:20:26 -0500 debian/patches/0000775000000000000000000000000011616210361010614 5ustar debian/patches/arlsmat.diff0000664000000000000000000021354711616207264013135 0ustar diff -rupN arpack++-2.3.orig/include/arbgcomp.h arpack++-2.3/include/arbgcomp.h --- arpack++-2.3.orig/include/arbgcomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arbgcomp.h 2010-09-08 15:43:56.833481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARBGCOMP_H #define ARBGCOMP_H -#include +#include #include "arch.h" #include "arbnsmat.h" #include "arbnspen.h" diff -rupN arpack++-2.3.orig/include/arbgnsym.h arpack++-2.3/include/arbgnsym.h --- arpack++-2.3.orig/include/arbgnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arbgnsym.h 2010-09-08 15:43:56.833481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARBGNSYM_H #define ARBGNSYM_H -#include +#include #include "arch.h" #include "arbnsmat.h" #include "arbnspen.h" diff -rupN arpack++-2.3.orig/include/arbgsym.h arpack++-2.3/include/arbgsym.h --- arpack++-2.3.orig/include/arbgsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arbgsym.h 2010-09-08 15:43:56.833481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARBGSYM_H #define ARBGSYM_H -#include +#include #include "arch.h" #include "arbsmat.h" #include "arbspen.h" diff -rupN arpack++-2.3.orig/include/arbnsmat.h arpack++-2.3/include/arbnsmat.h --- arpack++-2.3.orig/include/arbnsmat.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arbnsmat.h 2010-09-08 15:43:56.833481000 +0200 @@ -20,7 +20,7 @@ #ifndef ARBNSMAT_H #define ARBNSMAT_H -#include +#include #include "arch.h" #include "armat.h" #include "arerror.h" @@ -420,7 +420,7 @@ operator=(const ARbdNonSymMatrixClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arbscomp.h arpack++-2.3/include/arbscomp.h --- arpack++-2.3.orig/include/arbscomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arbscomp.h 2010-09-08 15:43:56.833481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARBSCOMP_H #define ARBSCOMP_H -#include +#include #include "arch.h" #include "arscomp.h" #include "arbnsmat.h" diff -rupN arpack++-2.3.orig/include/arbsmat.h arpack++-2.3/include/arbsmat.h --- arpack++-2.3.orig/include/arbsmat.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arbsmat.h 2010-09-08 15:43:56.833481000 +0200 @@ -20,7 +20,7 @@ #ifndef ARBSMAT_H #define ARBSMAT_H -#include +#include #include "arch.h" #include "armat.h" #include "arerror.h" @@ -367,7 +367,7 @@ operator=(const ARbdSymMatrix& o { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arbsnsym.h arpack++-2.3/include/arbsnsym.h --- arpack++-2.3.orig/include/arbsnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arbsnsym.h 2010-09-08 16:07:23.243480000 +0200 @@ -18,7 +18,7 @@ #ifndef ARBSNSYM_H #define ARBSNSYM_H -#include +#include #include "arch.h" #include "arsnsym.h" #include "arbnsmat.h" diff -rupN arpack++-2.3.orig/include/arbssym.h arpack++-2.3/include/arbssym.h --- arpack++-2.3.orig/include/arbssym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arbssym.h 2010-09-08 16:07:12.753481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARBSSYM_H #define ARBSSYM_H -#include +#include #include "arch.h" #include "arssym.h" #include "arbsmat.h" diff -rupN arpack++-2.3.orig/include/ardgcomp.h arpack++-2.3/include/ardgcomp.h --- arpack++-2.3.orig/include/ardgcomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/ardgcomp.h 2010-09-08 15:47:46.783481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARDGCOMP_H #define ARDGCOMP_H -#include +#include #include "arch.h" #include "ardnsmat.h" #include "ardnspen.h" diff -rupN arpack++-2.3.orig/include/ardgnsym.h arpack++-2.3/include/ardgnsym.h --- arpack++-2.3.orig/include/ardgnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/ardgnsym.h 2010-09-08 15:47:59.843481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARDGNSYM_H #define ARDGNSYM_H -#include +#include #include "arch.h" #include "ardnsmat.h" #include "ardnspen.h" diff -rupN arpack++-2.3.orig/include/ardgsym.h arpack++-2.3/include/ardgsym.h --- arpack++-2.3.orig/include/ardgsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/ardgsym.h 2010-09-08 15:48:09.813481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARDGSYM_H #define ARDGSYM_H -#include +#include #include "arch.h" #include "ardsmat.h" #include "ardspen.h" diff -rupN arpack++-2.3.orig/include/ardnsmat.h arpack++-2.3/include/ardnsmat.h --- arpack++-2.3.orig/include/ardnsmat.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/ardnsmat.h 2010-09-08 15:48:18.423481000 +0200 @@ -20,7 +20,7 @@ #ifndef ARDNSMAT_H #define ARDNSMAT_H -#include +#include #include "arch.h" #include "armat.h" #include "arerror.h" diff -rupN arpack++-2.3.orig/include/ardscomp.h arpack++-2.3/include/ardscomp.h --- arpack++-2.3.orig/include/ardscomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/ardscomp.h 2010-09-08 16:06:42.293481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARDSCOMP_H #define ARDSCOMP_H -#include +#include #include "arch.h" #include "arscomp.h" #include "ardnsmat.h" diff -rupN arpack++-2.3.orig/include/ardsmat.h arpack++-2.3/include/ardsmat.h --- arpack++-2.3.orig/include/ardsmat.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/ardsmat.h 2010-09-08 16:06:34.113481000 +0200 @@ -20,7 +20,7 @@ #ifndef ARDSMAT_H #define ARDSMAT_H -#include +#include #include "arch.h" #include "armat.h" #include "arerror.h" @@ -345,7 +345,7 @@ operator=(const ARdsSymMatrix& o { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/ardsnsym.h arpack++-2.3/include/ardsnsym.h --- arpack++-2.3.orig/include/ardsnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/ardsnsym.h 2010-09-08 16:06:21.353481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARDSNSYM_H #define ARDSNSYM_H -#include +#include #include "arch.h" #include "arsnsym.h" #include "ardnsmat.h" diff -rupN arpack++-2.3.orig/include/ardssym.h arpack++-2.3/include/ardssym.h --- arpack++-2.3.orig/include/ardssym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/ardssym.h 2010-09-08 16:06:09.443481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARDSSYM_H #define ARDSSYM_H -#include +#include #include "arch.h" #include "arssym.h" #include "ardsmat.h" diff -rupN arpack++-2.3.orig/include/argcomp.h arpack++-2.3/include/argcomp.h --- arpack++-2.3.orig/include/argcomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/argcomp.h 2010-09-08 16:05:57.793481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARGCOMP_H #define ARGCOMP_H -#include +#include #include "arch.h" #include "arscomp.h" #include "argeig.h" diff -rupN arpack++-2.3.orig/include/argeig.h arpack++-2.3/include/argeig.h --- arpack++-2.3.orig/include/argeig.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/argeig.h 2010-09-08 16:05:41.823481000 +0200 @@ -19,7 +19,7 @@ #ifndef ARGEIG_H #define ARGEIG_H -#include +#include #include "arch.h" #include "arerror.h" #include "arrgeig.h" diff -rupN arpack++-2.3.orig/include/argnsym.h arpack++-2.3/include/argnsym.h --- arpack++-2.3.orig/include/argnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/argnsym.h 2010-09-08 16:05:33.803481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARGNSYM_H #define ARGNSYM_H -#include +#include #include "arch.h" #include "blas1c.h" #include "lapackc.h" diff -rupN arpack++-2.3.orig/include/argsym.h arpack++-2.3/include/argsym.h --- arpack++-2.3.orig/include/argsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/argsym.h 2010-09-08 16:05:23.163481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARGSYM_H #define ARGSYM_H -#include +#include #include "arch.h" #include "arssym.h" #include "arrgsym.h" diff -rupN arpack++-2.3.orig/include/arlgcomp.h arpack++-2.3/include/arlgcomp.h --- arpack++-2.3.orig/include/arlgcomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlgcomp.h 2010-09-08 16:04:55.773481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARLGCOMP_H #define ARLGCOMP_H -#include +#include #include "arch.h" #include "arlnsmat.h" #include "arlnspen.h" @@ -103,9 +103,9 @@ Copy(const ARluCompGenEig& othe ARCompGenEig, ARFLOAT >, ARluNonSymPencil, ARFLOAT> >:: Copy(other); Pencil = other.Pencil; - objOP = &Pencil; - objB = &Pencil; - if (mode > 2) objOP->FactorAsB(sigmaR); + this->objOP = &Pencil; + this->objB = &Pencil; + if (this->mode > 2) this->objOP->FactorAsB(this->sigmaR); } // Copy. @@ -114,7 +114,7 @@ template inline void ARluCompGenEig::ChangeShift(arcomplex sigmap) { - objOP->FactorAsB(sigmap); + this->objOP->FactorAsB(sigmap); ARrcStdEig >::ChangeShift(sigmap); } // ChangeShift. @@ -155,7 +155,7 @@ ARluCompGenEig(int nevp, ARluNonSymMatri { Pencil.DefineMatrices(A, B); - NoShift(); + this->NoShift(); DefineParameters(A.ncols(), nevp, &Pencil, &ARluNonSymPencil, ARFLOAT>::MultInvBAv, &Pencil, @@ -192,7 +192,7 @@ operator=(const ARluCompGenEig& { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arlgnsym.h arpack++-2.3/include/arlgnsym.h --- arpack++-2.3.orig/include/arlgnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlgnsym.h 2010-09-08 16:04:42.263481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARLGNSYM_H #define ARLGNSYM_H -#include +#include #include "arch.h" #include "arlnsmat.h" #include "arlnspen.h" @@ -110,15 +110,15 @@ Copy(const ARluNonSymGenEig& ot ARNonSymGenEig, ARluNonSymPencil >:: Copy(other); Pencil = other.Pencil; - objOP = &Pencil; - objB = &Pencil; - objA = &Pencil; - if (mode > 2) { - if (sigmaI == 0.0) { - objOP->FactorAsB(sigmaR); + this->objOP = &Pencil; + this->objB = &Pencil; + this->objA = &Pencil; + if (this->mode > 2) { + if (this->sigmaI == 0.0) { + this->objOP->FactorAsB(this->sigmaR); } else { - objOP->FactorAsB(sigmaR, sigmaI, part); + this->objOP->FactorAsB(this->sigmaR, this->sigmaI, this->part); } } @@ -131,10 +131,10 @@ ChangeShift(ARFLOAT sigmaRp, ARFLOAT sig { if (sigmaIp == 0.0) { - objOP->FactorAsB(sigmaRp); + this->objOP->FactorAsB(sigmaRp); } else { - objOP->FactorAsB(sigmaRp, sigmaIp, part); + this->objOP->FactorAsB(sigmaRp, sigmaIp, this->part); } ARrcNonSymGenEig::ChangeShift(sigmaRp, sigmaIp); @@ -186,7 +186,7 @@ ARluNonSymGenEig(int nevp, ARluNonSymMat { Pencil.DefineMatrices(A, B); - NoShift(); + this->NoShift(); DefineParameters(A.ncols(), nevp, &Pencil, &ARluNonSymPencil::MultInvBAv, &Pencil, &ARluNonSymPencil::MultBv, whichp, @@ -240,7 +240,7 @@ operator=(const ARluNonSymGenEigClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arlgsym.h arpack++-2.3/include/arlgsym.h --- arpack++-2.3.orig/include/arlgsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlgsym.h 2010-09-08 16:04:14.103481000 +0200 @@ -19,7 +19,7 @@ #ifndef ARLGSYM_H #define ARLGSYM_H -#include +#include #include "arch.h" #include "arlsmat.h" #include "arlspen.h" @@ -105,10 +105,10 @@ Copy(const ARluSymGenEig& other ARSymGenEig, ARluSymPencil >:: Copy(other); Pencil = other.Pencil; - objOP = &Pencil; - objB = &Pencil; - objA = &Pencil; - if (mode > 2) objOP->FactorAsB(sigmaR); + this->objOP = &Pencil; + this->objB = &Pencil; + this->objA = &Pencil; + if (this->mode > 2) this->objOP->FactorAsB(this->sigmaR); } // Copy. @@ -117,7 +117,7 @@ template inline void ARluSymGenEig::ChangeShift(ARFLOAT sigmap) { - objOP->FactorAsB(sigmap); + this->objOP->FactorAsB(sigmap); ARrcSymGenEig::ChangeShift(sigmap); } // ChangeShift. @@ -179,8 +179,8 @@ ARluSymGenEig(int nevp, ARluSymMatrixInvertMode = 'S'; + this->NoShift(); DefineParameters(A.ncols(), nevp, &Pencil, &ARluSymPencil::MultInvBAv, &Pencil, &ARluSymPencil::MultBv, whichp, @@ -203,8 +203,8 @@ ARluSymGenEig(char InvertModep, int nevp &ARluSymPencil::MultInvAsBv, &Pencil, &ARluSymPencil::MultBv, whichp, ncvp, tolp, maxitp, residp, ishiftp); - InvertMode = CheckInvertMode(InvertModep); - switch (InvertMode) { + this->InvertMode = this->CheckInvertMode(InvertModep); + switch (this->InvertMode) { case 'B': // Buckling mode. ChangeMultBx(&Pencil, &ARluSymPencil::MultAv); case 'S': // Shift and invert mode. @@ -223,7 +223,7 @@ operator=(const ARluSymGenEig& { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arlnsmat.h arpack++-2.3/include/arlnsmat.h --- arpack++-2.3.orig/include/arlnsmat.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlnsmat.h 2010-09-08 16:04:05.793481000 +0200 @@ -20,7 +20,7 @@ #ifndef ARLNSMAT_H #define ARLNSMAT_H -#include +#include #include "arch.h" #include "armat.h" #include "arhbmat.h" @@ -130,16 +130,16 @@ bool ARluNonSymMatrix:: // Checking if pcol is in ascending order. i = 0; - while ((i!=n)&&(pcol[i]<=pcol[i+1])) i++; - if (i!=n) return false; + while ((i!=this->n)&&(pcol[i]<=pcol[i+1])) i++; + if (i!=this->n) return false; // Checking if irow components are in order and within bounds. - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { j = pcol[i]; k = pcol[i+1]-1; if (j<=k) { - if ((irow[j]<0)||(irow[k]>=n)) return false; + if ((irow[j]<0)||(irow[k]>=this->n)) return false; while ((j!=k)&&(irow[j]defined = other.defined; factored = other.factored; // Returning from here if "other" was not initialized. - if (!defined) return; + if (!this->defined) return; // Copying user-defined parameters. @@ -198,7 +198,7 @@ void ARluNonSymMatrix:: Destroy_CompCol_Matrix(&U); StatFree(); } - if (defined) { + if (this->defined) { Destroy_SuperMatrix_Store(&A); // delete A.Store; delete[] permc; delete[] permr; @@ -231,7 +231,7 @@ SubtractAsI(ARTYPE sigma, NCformat& A, N k = 0; AsI.colptr[0] = 0; - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { j = A.colptr[i]; end = A.colptr[i+1]; @@ -264,7 +264,7 @@ SubtractAsI(ARTYPE sigma, NCformat& A, N } - AsI.nnz = AsI.colptr[n]; + AsI.nnz = AsI.colptr[this->n]; } // SubtractAsI. @@ -281,13 +281,13 @@ void ARluNonSymMatrix:: // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluNonSymMatrix::FactorA"); } // Quitting the function if A is not square. - if (m != n) { + if (this->m != this->n) { throw ArpackError(ArpackError::NOT_SQUARE_MATRIX, "ARluNonSymMatrix::FactorA"); } @@ -308,7 +308,7 @@ void ARluNonSymMatrix:: // Reserving memory for etree (used in matrix decomposition). - etree = new int[n]; + etree = new int[this->n]; // Defining LUStat. @@ -342,7 +342,7 @@ void ARluNonSymMatrix:: throw ArpackError(ArpackError::PARAMETER_ERROR, "ARluNonSymMatrix::FactorA"); } - else if (info > n) { // Memory is not sufficient. + else if (info > this->n) { // Memory is not sufficient. throw ArpackError(ArpackError::MEMORY_OVERFLOW, "ARluNonSymMatrix::FactorA"); } @@ -360,14 +360,14 @@ void ARluNonSymMatrix:: // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluNonSymMatrix::FactorAsI"); } // Quitting the function if A is not square. - if (m != n) { + if (this->m != this->n) { throw ArpackError(ArpackError::NOT_SQUARE_MATRIX, "ARluNonSymMatrix::FactorAsI"); } @@ -400,10 +400,10 @@ void ARluNonSymMatrix:: // Creating a temporary matrix AsI. - irowi = new int[nnz+n]; - pcoli = new int[n+1]; - asi = new ARTYPE[nnz+n]; - Create_CompCol_Matrix(&AsI, n, n, nnz, asi, irowi, pcoli, NC, GE); + irowi = new int[nnz+this->n]; + pcoli = new int[this->n+1]; + asi = new ARTYPE[nnz+this->n]; + Create_CompCol_Matrix(&AsI, this->n, this->n, nnz, asi, irowi, pcoli, NC, GE); // Subtracting sigma*I from A and storing the result on AsI. @@ -413,7 +413,7 @@ void ARluNonSymMatrix:: // Reserving memory for etree (used in matrix decomposition). - etree = new int[n]; + etree = new int[this->n]; // Defining LUStat. @@ -448,7 +448,7 @@ void ARluNonSymMatrix:: throw ArpackError(ArpackError::PARAMETER_ERROR, "ARluNonSymMatrix::FactorAsI"); } - else if (info > n) { // Memory is not sufficient. + else if (info > this->n) { // Memory is not sufficient. throw ArpackError(ArpackError::MEMORY_OVERFLOW, "ARluNonSymMatrix::FactorAsI"); } @@ -469,15 +469,15 @@ void ARluNonSymMatrix:: // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluNonSymMatrix::MultMv"); } // Determining w = M.v. - for (i=0; i!=m; i++) w[i]=(ARTYPE)0; + for (i=0; i!=this->m; i++) w[i]=(ARTYPE)0; - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { t = v[i]; for (j=pcol[i]; j!=pcol[i+1]; j++) { w[irow[j]] += t*a[j]; @@ -496,13 +496,13 @@ void ARluNonSymMatrix:: // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluNonSymMatrix::MultMtv"); } // Determining w = M'.v. - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { t = (ARTYPE)0; for (j=pcol[i]; j!=pcol[i+1]; j++) { t += v[irow[j]]*a[j]; @@ -517,7 +517,7 @@ template void ARluNonSymMatrix::MultMtMv(ARTYPE* v, ARTYPE* w) { - ARTYPE* t = new ARTYPE[m]; + ARTYPE* t = new ARTYPE[this->m]; MultMv(v,t); MultMtv(t,w); @@ -531,7 +531,7 @@ template void ARluNonSymMatrix::MultMMtv(ARTYPE* v, ARTYPE* w) { - ARTYPE* t = new ARTYPE[n]; + ARTYPE* t = new ARTYPE[this->n]; MultMtv(v,t); MultMv(t,w); @@ -545,8 +545,8 @@ template void ARluNonSymMatrix::Mult0MMt0v(ARTYPE* v, ARTYPE* w) { - MultMv(&v[m],w); - MultMtv(v,&w[m]); + MultMv(&v[this->m],w); + MultMtv(v,&w[this->m]); } // Mult0MMt0v. @@ -567,8 +567,8 @@ void ARluNonSymMatrix:: int info; SuperMatrix B; - if (&v != &w) copy(n, v, 1, w, 1); - Create_Dense_Matrix(&B, n, 1, w, n, DN, GE); + if (&v != &w) copy(this->n, v, 1, w, 1); + Create_Dense_Matrix(&B, this->n, 1, w, this->n, DN, GE); gstrs("N", &L, &U, permr, permc, &B, &info); Destroy_SuperMatrix_Store(&B); // delete B.Store; @@ -581,13 +581,13 @@ DefineMatrix(int np, int nnzp, ARTYPE* a double thresholdp, int orderp, bool check) { - m = np; - n = np; + this->m = np; + this->n = np; nnz = nnzp; a = ap; irow = irowp; pcol = pcolp; - pcol[n] = nnz; + pcol[this->n] = nnz; threshold = thresholdp; order = orderp; @@ -600,14 +600,14 @@ DefineMatrix(int np, int nnzp, ARTYPE* a // Creating SuperMatrix A. - Create_CompCol_Matrix(&A, n, n, nnz, a, irow, pcol, NC, GE); + Create_CompCol_Matrix(&A, this->n, this->n, nnz, a, irow, pcol, NC, GE); // Reserving memory for vectors used in matrix decomposition. - permc = new int[n]; - permr = new int[n]; + permc = new int[this->n]; + permr = new int[this->n]; - defined = true; + this->defined = true; } // DefineMatrix (square). @@ -617,14 +617,14 @@ inline void ARluNonSymMatrixm = mp; + this->n = np; nnz = nnzp; a = ap; irow = irowp; pcol = pcolp; - pcol[n] = nnz; - defined = true; + pcol[this->n] = nnz; + this->defined = true; permc = NULL; permr = NULL; diff -rupN arpack++-2.3.orig/include/arlnspen.h arpack++-2.3/include/arlnspen.h --- arpack++-2.3.orig/include/arlnspen.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlnspen.h 2010-09-08 16:03:15.833481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARLNSPEN_H #define ARLNSPEN_H -#include +#include #include "arch.h" #include "arerror.h" #include "blas1c.h" diff -rupN arpack++-2.3.orig/include/arlscomp.h arpack++-2.3/include/arlscomp.h --- arpack++-2.3.orig/include/arlscomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlscomp.h 2010-09-08 16:03:08.093481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARLSCOMP_H #define ARLSCOMP_H -#include +#include #include "arch.h" #include "arscomp.h" #include "arlnsmat.h" @@ -97,7 +97,7 @@ Copy(const ARluCompStdEig& othe ARStdEig, ARluNonSymMatrix, ARFLOAT> >:: Copy(other); - if (mode > 2) objOP->FactorAsI(sigmaR); + if (this->mode > 2) this->objOP->FactorAsI(this->sigmaR); } // Copy. @@ -106,7 +106,7 @@ template inline void ARluCompStdEig::ChangeShift(arcomplex sigmap) { - objOP->FactorAsI(sigmap); + this->objOP->FactorAsI(sigmap); ARrcStdEig >::ChangeShift(sigmap); } // ChangeShift. @@ -118,7 +118,7 @@ inline void ARluCompStdEig::Set ARStdEig, ARluNonSymMatrix, ARFLOAT> >:: - SetRegularMode(objOP, + SetRegularMode(this->objOP, &ARluNonSymMatrix, ARFLOAT>::MultMv); } // SetRegularMode. @@ -131,7 +131,7 @@ SetShiftInvertMode(arcomplex si ARStdEig, ARluNonSymMatrix, ARFLOAT> >:: - SetShiftInvertMode(sigmap, objOP, + SetShiftInvertMode(sigmap, this->objOP, &ARluNonSymMatrix,ARFLOAT>::MultInvv); } // SetShiftInvertMode. @@ -145,7 +145,7 @@ ARluCompStdEig(int nevp, ARluNonSymMatri { - NoShift(); + this->NoShift(); DefineParameters(A.ncols(), nevp, &A, &ARluNonSymMatrix, ARFLOAT>::MultMv, whichp, ncvp, tolp, maxitp, residp, ishiftp); @@ -176,7 +176,7 @@ operator=(const ARluCompStdEig& { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arlsmat.h arpack++-2.3/include/arlsmat.h --- arpack++-2.3.orig/include/arlsmat.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlsmat.h 2010-09-08 16:02:50.483481000 +0200 @@ -20,7 +20,7 @@ #ifndef ARLSMAT_H #define ARLSMAT_H -#include +#include #include "arch.h" #include "armat.h" #include "arhbmat.h" @@ -117,12 +117,12 @@ bool ARluSymMatrix::DataOK() // Checking if pcol is in ascending order. i = 0; - while ((i!=n)&&(pcol[i]<=pcol[i+1])) i++; - if (i!=n) return false; + while ((i!=this->n)&&(pcol[i]<=pcol[i+1])) i++; + if (i!=this->n) return false; // Checking if irow components are in order and within bounds. - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { j = pcol[i]; k = pcol[i+1]-1; if (j<=k) { @@ -130,7 +130,7 @@ bool ARluSymMatrix::DataOK() if ((irow[j]<0)||(irow[k]>i)) return false; } else { // uplo == 'L'. - if ((irow[j]=n)) return false; + if ((irow[j]=this->n)) return false; } while ((j!=k)&&(irow[j]::Copy( // Copying very fundamental variables. - defined = other.defined; + this->defined = other.defined; factored = other.factored; // Returning from here if "other" was not initialized. - if (!defined) return; + if (!this->defined) return; // Copying user-defined parameters. @@ -183,7 +183,7 @@ void ARluSymMatrix::ClearMem() Destroy_CompCol_Matrix(&U); StatFree(); } - if (defined) { + if (this->defined) { Destroy_SuperMatrix_Store(&A); // delete A.Store; delete[] permc; delete[] permr; @@ -223,13 +223,13 @@ ExpandA(NCformat& A, NCformat& Aexp, ART // Filling colE with zeros. - for (i=0; i<=n; i++) colE[i] = 0; + for (i=0; i<=this->n; i++) colE[i] = 0; // Counting the elements in each column of A. if (uplo == 'U') { - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { k = colA[i+1]; if ((k!=colA[i])&&(indA[k-1]==i)) { k--; @@ -243,7 +243,7 @@ ExpandA(NCformat& A, NCformat& Aexp, ART } else { // uplo == 'L' - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { k = colA[i]; if ((k!=colA[i+1])&&(indA[k]==i)) { k++; @@ -258,18 +258,18 @@ ExpandA(NCformat& A, NCformat& Aexp, ART // Summing up colE elements. - for (i=0; in; i++) colE[i+1]+=colE[i]; // Adding colA to colE. - for (i=n; i>0; i--) colE[i] = colE[i-1]+colA[i]; + for (i=this->n; i>0; i--) colE[i] = colE[i-1]+colA[i]; colE[0] = colA[0]; // Expanding A. if (uplo == 'U') { - for (i=0; in; i++) { for (j=colA[i]; j<(colA[i+1]-1); j++) { indE[colE[i]] = indA[j]; indE[colE[indA[j]]] = i; @@ -296,7 +296,7 @@ ExpandA(NCformat& A, NCformat& Aexp, ART } else { // uplo == 'L' - for (i=0; in; i++) { k=colA[i]; if ((k!=colA[i+1])&&(indA[k]==i)) { indE[colE[i]] = i; @@ -326,12 +326,12 @@ ExpandA(NCformat& A, NCformat& Aexp, ART // Adjusting index. - for (i=n; i>0; i--) { + for (i=this->n; i>0; i--) { colE[i] = colE[i-1]; } colE[0] = 0; - Aexp.nnz = colE[n]; + Aexp.nnz = colE[this->n]; } // ExpandA. @@ -342,7 +342,7 @@ void ARluSymMatrix::FactorA() // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluSymMatrix::FactorA"); } @@ -375,9 +375,9 @@ void ARluSymMatrix::FactorA() // Creating a temporary matrix Aexp. irowi = new int[nnz*2]; - pcoli = new int[n+1]; + pcoli = new int[this->n+1]; aexp = new ARTYPE[nnz*2]; - Create_CompCol_Matrix(&Aexp, n, n, nnz, aexp, irowi, pcoli, NC, GE); + Create_CompCol_Matrix(&Aexp, this->n, this->n, nnz, aexp, irowi, pcoli, NC, GE); // Expanding A. @@ -387,7 +387,7 @@ void ARluSymMatrix::FactorA() // Reserving memory for etree (used in matrix decomposition). - etree = new int[n]; + etree = new int[this->n]; // Defining LUStat. @@ -421,7 +421,7 @@ void ARluSymMatrix::FactorA() throw ArpackError(ArpackError::PARAMETER_ERROR, "ARluSymMatrix::FactorA"); } - else if (info > n) { // Memory is not sufficient. + else if (info > this->n) { // Memory is not sufficient. throw ArpackError(ArpackError::MEMORY_OVERFLOW, "ARluSymMatrix::FactorA"); } @@ -439,7 +439,7 @@ void ARluSymMatrix::FactorAsI(AR // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluSymMatrix::FactorAsI"); } @@ -471,10 +471,10 @@ void ARluSymMatrix::FactorAsI(AR // Creating a temporary matrix AsI. - irowi = new int[nnz*2+n]; - pcoli = new int[n+1]; - asi = new ARTYPE[nnz*2+n]; - Create_CompCol_Matrix(&AsI, n, n, nnz, asi, irowi, pcoli, NC, GE); + irowi = new int[nnz*2+this->n]; + pcoli = new int[this->n+1]; + asi = new ARTYPE[nnz*2+this->n]; + Create_CompCol_Matrix(&AsI, this->n, this->n, nnz, asi, irowi, pcoli, NC, GE); // Subtracting sigma*I from A and storing the result on AsI. @@ -484,7 +484,7 @@ void ARluSymMatrix::FactorAsI(AR // Reserving memory for etree (used in matrix decomposition). - etree = new int[n]; + etree = new int[this->n]; // Defining LUStat. @@ -518,7 +518,7 @@ void ARluSymMatrix::FactorAsI(AR throw ArpackError(ArpackError::PARAMETER_ERROR, "ARluSymMatrix::FactorAsI"); } - else if (info > n) { // Memory is not sufficient. + else if (info > this->n) { // Memory is not sufficient. throw ArpackError(ArpackError::MEMORY_OVERFLOW, "ARluSymMatrix::FactorAsI"); } @@ -539,17 +539,17 @@ void ARluSymMatrix::MultMv(ARTYP // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluSymMatrix::MultMv"); } // Determining w = M.v. - for (i=0; i!=m; i++) w[i]=(ARTYPE)0; + for (i=0; i!=this->m; i++) w[i]=(ARTYPE)0; if (uplo == 'U') { - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { t = v[i]; k = pcol[i+1]; if ((k!=pcol[i])&&(irow[k-1]==i)) { @@ -565,7 +565,7 @@ void ARluSymMatrix::MultMv(ARTYP } else { - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { t = v[i]; k = pcol[i]; if ((k!=pcol[i+1])&&(irow[k]==i)) { @@ -599,8 +599,8 @@ void ARluSymMatrix::MultInvv(ART int info; SuperMatrix B; - if (&v != &w) copy(n, v, 1, w, 1); - Create_Dense_Matrix(&B, n, 1, w, n, DN, GE); + if (&v != &w) copy(this->n, v, 1, w, 1); + Create_Dense_Matrix(&B, this->n, 1, w, this->n, DN, GE); gstrs("N", &L, &U, permr, permc, &B, &info); Destroy_SuperMatrix_Store(&B); // delete B.Store; @@ -613,13 +613,13 @@ DefineMatrix(int np, int nnzp, ARTYPE* a char uplop, double thresholdp, int orderp, bool check) { - m = np; - n = np; + this->m = np; + this->n = np; nnz = nnzp; a = ap; irow = irowp; pcol = pcolp; - pcol[n] = nnz; + pcol[this->n] = nnz; uplo = uplop; threshold = thresholdp; order = orderp; @@ -633,14 +633,14 @@ DefineMatrix(int np, int nnzp, ARTYPE* a // Creating SuperMatrix A. - Create_CompCol_Matrix(&A, n, n, nnz, a, irow, pcol, NC, GE); + Create_CompCol_Matrix(&A, this->n, this->n, nnz, a, irow, pcol, NC, GE); // Reserving memory for vectors used in matrix decomposition. - permc = new int[n]; - permr = new int[n]; + permc = new int[this->n]; + permr = new int[this->n]; - defined = true; + this->defined = true; } // DefineMatrix. diff -rupN arpack++-2.3.orig/include/arlsnsym.h arpack++-2.3/include/arlsnsym.h --- arpack++-2.3.orig/include/arlsnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlsnsym.h 2010-09-08 16:02:02.443481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARLSNSYM_H #define ARLSNSYM_H -#include +#include #include "arch.h" #include "arsnsym.h" #include "arlnsmat.h" @@ -91,7 +91,7 @@ Copy(const ARluNonSymStdEig& ot { ARStdEig >:: Copy(other); - if (mode > 2) objOP->FactorAsI(sigmaR); + if (this->mode > 2) this->objOP->FactorAsI(this->sigmaR); } // Copy. @@ -100,13 +100,13 @@ template inline void ARluNonSymStdEig::ChangeShift(ARFLOAT sigmaRp) { - sigmaR = sigmaRp; - sigmaI = 0.0; - mode = 3; - iparam[7] = mode; + this->sigmaR = sigmaRp; + this->sigmaI = 0.0; + this->mode = 3; + this->iparam[7] = this->mode; - objOP->FactorAsI(sigmaR); - Restart(); + this->objOP->FactorAsI(this->sigmaR); + this->Restart(); } // ChangeShift. @@ -116,7 +116,7 @@ inline void ARluNonSymStdEig::S { ARStdEig >:: - SetRegularMode(objOP, &ARluNonSymMatrix::MultMv); + SetRegularMode(this->objOP, &ARluNonSymMatrix::MultMv); } // SetRegularMode. @@ -126,7 +126,7 @@ inline void ARluNonSymStdEig::S { ARStdEig >:: - SetShiftInvertMode(sigmap, objOP, + SetShiftInvertMode(sigmap, this->objOP, &ARluNonSymMatrix::MultInvv); } // SetShiftInvertMode. @@ -140,7 +140,7 @@ ARluNonSymStdEig(int nevp, ARluNonSymMat { - NoShift(); + this->NoShift(); DefineParameters(A.ncols(), nevp, &A, &ARluNonSymMatrix::MultMv, whichp, ncvp, tolp, maxitp, residp, ishiftp); @@ -170,7 +170,7 @@ operator=(const ARluNonSymStdEigClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arlspdef.h arpack++-2.3/include/arlspdef.h --- arpack++-2.3.orig/include/arlspdef.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlspdef.h 2010-09-08 21:49:16.893481001 +0200 @@ -280,7 +280,7 @@ extern void Destroy_SuperNode_Matrix( extern void Destroy_CompCol_Permuted(SuperMatrix *); extern void Destroy_Dense_Matrix(SuperMatrix *); extern void get_perm_c(int, SuperMatrix *, int *); -extern void sp_preorder (char*, SuperMatrix*, int*, int*, SuperMatrix*); +extern void sp_preorder (const char*, SuperMatrix*, int*, int*, SuperMatrix*); // extern void countnz (const int, int *, int *, int *, sGlobalLU_t *); // extern void fixupL (const int, const int *, sGlobalLU_t *); @@ -288,16 +288,16 @@ extern void sallocateA (int, int, flo extern void dallocateA (int, int, double **, int **, int **); extern void callocateA (int, int, lscomplex **, int **, int **); extern void zallocateA (int, int, ldcomplex **, int **, int **); -extern void sgstrf (char*, SuperMatrix*, float, float, int, int, int*, +extern void sgstrf (const char*, SuperMatrix*, float, float, int, int, int*, void *, int, int *, int *, SuperMatrix *, SuperMatrix *, int *); -extern void dgstrf (char*, SuperMatrix*, double, double, int, int, int*, +extern void dgstrf (const char*, SuperMatrix*, double, double, int, int, int*, void *, int, int *, int *, SuperMatrix *, SuperMatrix *, int *); -extern void cgstrf (char*, SuperMatrix*, float, float, int, int, int*, +extern void cgstrf (const char*, SuperMatrix*, float, float, int, int, int*, void *, int, int *, int *, SuperMatrix *, SuperMatrix *, int *); -extern void zgstrf (char*, SuperMatrix*, double, double, int, int, int*, +extern void zgstrf (const char*, SuperMatrix*, double, double, int, int, int*, void *, int, int *, int *, SuperMatrix *, SuperMatrix *, int *); extern int ssnode_dfs (const int, const int, const int *, const int *, @@ -396,13 +396,13 @@ extern void cFillRHS (char *, int, ls SuperMatrix *); extern void zFillRHS (char *, int, ldcomplex *, int, SuperMatrix *, SuperMatrix *); -extern void sgstrs (char *, SuperMatrix *, SuperMatrix *, int *, int *, +extern void sgstrs (const char *, SuperMatrix *, SuperMatrix *, int *, int *, SuperMatrix *, int *); -extern void dgstrs (char *, SuperMatrix *, SuperMatrix *, int *, int *, +extern void dgstrs (const char *, SuperMatrix *, SuperMatrix *, int *, int *, SuperMatrix *, int *); -extern void cgstrs (char *, SuperMatrix *, SuperMatrix *, int *, int *, +extern void cgstrs (const char *, SuperMatrix *, SuperMatrix *, int *, int *, SuperMatrix *, int *); -extern void zgstrs (char *, SuperMatrix *, SuperMatrix *, int *, int *, +extern void zgstrs (const char *, SuperMatrix *, SuperMatrix *, int *, int *, SuperMatrix *, int *); diff -rupN arpack++-2.3.orig/include/arlspen.h arpack++-2.3/include/arlspen.h --- arpack++-2.3.orig/include/arlspen.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlspen.h 2010-09-08 16:01:45.383481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARLSPEN_H #define ARLSPEN_H -#include +#include #include "arch.h" #include "arerror.h" #include "blas1c.h" diff -rupN arpack++-2.3.orig/include/arlssym.h arpack++-2.3/include/arlssym.h --- arpack++-2.3.orig/include/arlssym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arlssym.h 2010-09-08 16:01:37.113481000 +0200 @@ -19,7 +19,7 @@ #ifndef ARLSSYM_H #define ARLSSYM_H -#include +#include #include "arch.h" #include "arssym.h" #include "arlsmat.h" @@ -92,7 +92,7 @@ inline void ARluSymStdEig::Copy { ARStdEig >:: Copy(other); - if (mode > 2) objOP->FactorAsI(sigmaR); + if (this->mode > 2) this->objOP->FactorAsI(this->sigmaR); } // Copy. @@ -101,13 +101,13 @@ template inline void ARluSymStdEig::ChangeShift(ARFLOAT sigmaRp) { - sigmaR = sigmaRp; - sigmaI = 0.0; - mode = 3; - iparam[7] = mode; + this->sigmaR = sigmaRp; + this->sigmaI = 0.0; + this->mode = 3; + this->iparam[7] = this->mode; - objOP->FactorAsI(sigmaR); - Restart(); + this->objOP->FactorAsI(this->sigmaR); + this->Restart(); } // ChangeShift. @@ -117,7 +117,7 @@ inline void ARluSymStdEig::SetR { ARStdEig >:: - SetRegularMode(objOP, &ARluSymMatrix::MultMv); + SetRegularMode(this->objOP, &ARluSymMatrix::MultMv); } // SetRegularMode. @@ -127,7 +127,7 @@ inline void ARluSymStdEig::SetS { ARStdEig >:: - SetShiftInvertMode(sigmap, objOP, &ARluSymMatrix::MultInvv); + SetShiftInvertMode(sigmap, this->objOP, &ARluSymMatrix::MultInvv); } // SetShiftInvertMode. @@ -139,7 +139,7 @@ ARluSymStdEig(int nevp, ARluSymMatrixNoShift(); DefineParameters(A.ncols(), nevp, &A, &ARluSymMatrix::MultMv, whichp, ncvp, tolp, maxitp, residp, ishiftp); @@ -167,7 +167,7 @@ operator=(const ARluSymStdEig& { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arrgcomp.h arpack++-2.3/include/arrgcomp.h --- arpack++-2.3.orig/include/arrgcomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arrgcomp.h 2010-09-08 16:01:13.133481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARRGCOMP_H #define ARRGCOMP_H -#include +#include #include "arch.h" #include "arrscomp.h" #include "arrgeig.h" diff -rupN arpack++-2.3.orig/include/arrgnsym.h arpack++-2.3/include/arrgnsym.h --- arpack++-2.3.orig/include/arrgnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arrgnsym.h 2010-09-08 16:00:26.983481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARRGNSYM_H #define ARRGNSYM_H -#include +#include #include "arch.h" #include "arrsnsym.h" #include "arrgeig.h" diff -rupN arpack++-2.3.orig/include/arrgsym.h arpack++-2.3/include/arrgsym.h --- arpack++-2.3.orig/include/arrgsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arrgsym.h 2010-09-08 16:00:16.203481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARRGSYM_H #define ARRGSYM_H -#include +#include #include "arch.h" #include "arrssym.h" #include "arrgeig.h" diff -rupN arpack++-2.3.orig/include/arrscomp.h arpack++-2.3/include/arrscomp.h --- arpack++-2.3.orig/include/arrscomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arrscomp.h 2010-09-08 15:59:59.313481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARRSCOMP_H #define ARRSCOMP_H -#include +#include #include "arch.h" #include "arerror.h" #include "debug.h" diff -rupN arpack++-2.3.orig/include/arrsnsym.h arpack++-2.3/include/arrsnsym.h --- arpack++-2.3.orig/include/arrsnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arrsnsym.h 2010-09-08 15:59:11.113481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARRSNSYM_H #define ARRSNSYM_H -#include +#include #include "arch.h" #include "arerror.h" #include "debug.h" diff -rupN arpack++-2.3.orig/include/arrssym.h arpack++-2.3/include/arrssym.h --- arpack++-2.3.orig/include/arrssym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arrssym.h 2010-09-08 15:44:01.953480000 +0200 @@ -17,7 +17,7 @@ #ifndef ARRSSYM_H #define ARRSSYM_H -#include +#include #include "arch.h" #include "arerror.h" #include "debug.h" diff -rupN arpack++-2.3.orig/include/arscomp.h arpack++-2.3/include/arscomp.h --- arpack++-2.3.orig/include/arscomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arscomp.h 2010-09-08 15:58:56.283481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARSCOMP_H #define ARSCOMP_H -#include +#include #include "arch.h" #include "arseig.h" #include "arrscomp.h" diff -rupN arpack++-2.3.orig/include/arseig.h arpack++-2.3/include/arseig.h --- arpack++-2.3.orig/include/arseig.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arseig.h 2010-09-08 15:44:01.953480000 +0200 @@ -19,7 +19,7 @@ #ifndef ARSEIG_H #define ARSEIG_H -#include +#include #include "arch.h" #include "arerror.h" #include "arrseig.h" diff -rupN arpack++-2.3.orig/include/arsnsym.h arpack++-2.3/include/arsnsym.h --- arpack++-2.3.orig/include/arsnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arsnsym.h 2010-09-08 15:57:05.623481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARSNSYM_H #define ARSNSYM_H -#include +#include #include "arch.h" #include "arseig.h" #include "arrsnsym.h" diff -rupN arpack++-2.3.orig/include/arssym.h arpack++-2.3/include/arssym.h --- arpack++-2.3.orig/include/arssym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arssym.h 2010-09-08 15:56:43.583481000 +0200 @@ -17,7 +17,7 @@ #ifndef ARSSYM_H #define ARSSYM_H -#include +#include #include "arch.h" #include "arseig.h" #include "arrssym.h" diff -rupN arpack++-2.3.orig/include/arugcomp.h arpack++-2.3/include/arugcomp.h --- arpack++-2.3.orig/include/arugcomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arugcomp.h 2010-09-08 15:56:22.283481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARUGCOMP_H #define ARUGCOMP_H -#include +#include #include "arch.h" #include "arunsmat.h" #include "arunspen.h" @@ -103,8 +103,8 @@ Copy(const ARluCompGenEig& othe ARCompGenEig, ARFLOAT >, ARumNonSymPencil, ARFLOAT> >:: Copy(other); Pencil = other.Pencil; - objOP = &Pencil; - objB = &Pencil; + this->objOP = &Pencil; + this->objB = &Pencil; } // Copy. @@ -114,7 +114,7 @@ inline void ARluCompGenEig:: ChangeShift(arcomplex sigmaRp) { - objOP->FactorAsB(sigmaRp); + this->objOP->FactorAsB(sigmaRp); ARrcStdEig >::ChangeShift(sigmaRp); } // ChangeShift. @@ -155,7 +155,7 @@ ARluCompGenEig(int nevp, ARumNonSymMatri { Pencil.DefineMatrices(A, B); - NoShift(); + this->NoShift(); DefineParameters(A.ncols(), nevp, &Pencil, &ARumNonSymPencil, ARFLOAT>::MultInvBAv, &Pencil, @@ -192,7 +192,7 @@ operator=(const ARluCompGenEig& { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arugnsym.h arpack++-2.3/include/arugnsym.h --- arpack++-2.3.orig/include/arugnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arugnsym.h 2010-09-08 15:56:12.453481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARUGNSYM_H #define ARUGNSYM_H -#include +#include #include "arch.h" #include "arunsmat.h" #include "arunspen.h" @@ -111,9 +111,9 @@ Copy(const ARluNonSymGenEig& ot ARNonSymGenEig, ARumNonSymPencil >:: Copy(other); Pencil = other.Pencil; - objOP = &Pencil; - objB = &Pencil; - objA = &Pencil; + this->objOP = &Pencil; + this->objB = &Pencil; + this->objA = &Pencil; } // Copy. @@ -124,10 +124,10 @@ ChangeShift(ARFLOAT sigmaRp, ARFLOAT sig { if (sigmaIp == 0.0) { - objOP->FactorAsB(sigmaRp); + this->objOP->FactorAsB(sigmaRp); } else { - objOP->FactorAsB(sigmaRp, sigmaIp, part); + this->objOP->FactorAsB(sigmaRp, sigmaIp, this->part); } ARrcNonSymGenEig::ChangeShift(sigmaRp, sigmaIp); @@ -179,7 +179,7 @@ ARluNonSymGenEig(int nevp, ARumNonSymMat { Pencil.DefineMatrices(A, B); - NoShift(); + this->NoShift(); DefineParameters(A.ncols(), nevp, &Pencil, &ARumNonSymPencil::MultInvBAv, &Pencil, &ARumNonSymPencil::MultBv, whichp, @@ -233,7 +233,7 @@ operator=(const ARluNonSymGenEigClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arugsym.h arpack++-2.3/include/arugsym.h --- arpack++-2.3.orig/include/arugsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arugsym.h 2010-09-08 15:55:46.563480000 +0200 @@ -19,7 +19,7 @@ #ifndef ARUGSYM_H #define ARUGSYM_H -#include +#include #include "arch.h" #include "arusmat.h" #include "aruspen.h" @@ -105,9 +105,9 @@ Copy(const ARluSymGenEig& other ARSymGenEig, ARumSymPencil >:: Copy(other); Pencil = other.Pencil; - objOP = &Pencil; - objB = &Pencil; - objA = &Pencil; + this->objOP = &Pencil; + this->objB = &Pencil; + this->objA = &Pencil; } // Copy. @@ -116,7 +116,7 @@ template inline void ARluSymGenEig::ChangeShift(ARFLOAT sigmap) { - objOP->FactorAsB(sigmap); + this->objOP->FactorAsB(sigmap); ARrcSymGenEig::ChangeShift(sigmap); } // ChangeShift. @@ -178,8 +178,8 @@ ARluSymGenEig(int nevp, ARumSymMatrixInvertMode = 'S'; + this->NoShift(); DefineParameters(A.ncols(), nevp, &Pencil, &ARumSymPencil::MultInvBAv, &Pencil, &ARumSymPencil::MultBv, whichp, @@ -202,8 +202,8 @@ ARluSymGenEig(char InvertModep, int nevp &ARumSymPencil::MultInvAsBv, &Pencil, &ARumSymPencil::MultBv, whichp, ncvp, tolp, maxitp, residp, ishiftp); - InvertMode = CheckInvertMode(InvertModep); - switch (InvertMode) { + this->InvertMode = this->CheckInvertMode(InvertModep); + switch (this->InvertMode) { case 'B': // Buckling mode. ChangeMultBx(&Pencil, &ARumSymPencil::MultAv); case 'S': // Shift and invert mode. @@ -222,7 +222,7 @@ operator=(const ARluSymGenEig& { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arunsmat.h arpack++-2.3/include/arunsmat.h --- arpack++-2.3.orig/include/arunsmat.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arunsmat.h 2010-09-08 15:55:21.933481000 +0200 @@ -20,7 +20,7 @@ #ifndef ARUNSMAT_H #define ARUNSMAT_H -#include +#include #include "arch.h" #include "armat.h" #include "arhbmat.h" @@ -145,16 +145,16 @@ bool ARumNonSymMatrix:: // Checking if pcol is in ascending order. i = 0; - while ((i!=n)&&(pcol[i]<=pcol[i+1])) i++; - if (i!=n) return false; + while ((i!=this->n)&&(pcol[i]<=pcol[i+1])) i++; + if (i!=this->n) return false; // Checking if irow components are in order and within bounds. - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { j = pcol[i]; k = pcol[i+1]-1; if (j<=k) { - if ((irow[j]<0)||(irow[k]>=n)) return false; + if ((irow[j]<0)||(irow[k]>=this->n)) return false; while ((j!=k)&&(irow[j]m = other.m; + this->n = other.n; + this->defined = other.defined; factored = other.factored; fillin = other.fillin; nnz = other.nnz; @@ -205,7 +205,7 @@ Copy(const ARumNonSymMatrixdefined) return; // Copying arrays with static dimension. @@ -237,10 +237,10 @@ void ARumNonSymMatrix:: // Subtracting sigma from diagonal elements. k = 0; - ki = n+1; + ki = this->n+1; index[0] = 1; - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { j = pcol[i]; end = pcol[i+1]; @@ -280,11 +280,11 @@ template inline void ARumNonSymMatrix::CreateStructure() { - int dimfact = (((fillin+1)*nnz)<(n*n)) ? (fillin+1)*nnz : n*n; + int dimfact = (((fillin+1)*nnz)<(this->n*this->n)) ? (fillin+1)*nnz : this->n*this->n; - ClearMem(); + this->ClearMem(); - lindex = 30*n+dimfact; // ????? + lindex = 30*this->n+dimfact; // ????? lvalue = dimfact; value = new ARTYPE[lvalue]; @@ -319,13 +319,13 @@ void ARumNonSymMatrix:: // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED,"ARumNonSymMatrix::FactorA"); } // Quitting the function if A is not square. - if (m != n) { + if (this->m != this->n) { throw ArpackError(ArpackError::NOT_SQUARE_MATRIX, "ARumNonSymMatrix::FactorA"); } @@ -344,13 +344,13 @@ void ARumNonSymMatrix:: copy(nnz, a, 1, value, 1); pi=pcol; pj=index; - for (i=0; i<=n; i++) *pj++ = (*pi++)+1; + for (i=0; i<=this->n; i++) *pj++ = (*pi++)+1; pi=irow; for (i=0; in, nnz, 0, false, lvalue, lindex, value, index, keep, cntl, icntl, info, rinfo); // Handling errors. @@ -368,14 +368,14 @@ void ARumNonSymMatrix:: // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARumNonSymMatrix::FactorAsI"); } // Quitting the function if A is not square. - if (m != n) { + if (this->m != this->n) { throw ArpackError(ArpackError::NOT_SQUARE_MATRIX, "ARumNonSymMatrix::FactorAsI"); } @@ -390,7 +390,7 @@ void ARumNonSymMatrix:: // Decomposing AsI. - um2fa(n, nnz, 0, false, lvalue, lindex, value, + um2fa(this->n, nnz, 0, false, lvalue, lindex, value, index, keep, cntl, icntl, info, rinfo); // Handling errors. @@ -411,15 +411,15 @@ void ARumNonSymMatrix:: // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARumNonSymMatrix::MultMv"); } // Determining w = M.v. - for (i=0; i!=m; i++) w[i]=(ARTYPE)0; + for (i=0; i!=this->m; i++) w[i]=(ARTYPE)0; - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { t = v[i]; for (j=pcol[i]; j!=pcol[i+1]; j++) { w[irow[j]] += t*a[j]; @@ -438,13 +438,13 @@ void ARumNonSymMatrix:: // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED,"ARumNonSymMatrix::MultMtv"); } // Determining w = M'.v. - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { t = (ARTYPE)0; for (j=pcol[i]; j!=pcol[i+1]; j++) { t += v[irow[j]]*a[j]; @@ -459,7 +459,7 @@ template void ARumNonSymMatrix::MultMtMv(ARTYPE* v, ARTYPE* w) { - ARTYPE* t = new ARTYPE[m]; + ARTYPE* t = new ARTYPE[this->m]; MultMv(v,t); MultMtv(t,w); @@ -473,7 +473,7 @@ template void ARumNonSymMatrix::MultMMtv(ARTYPE* v, ARTYPE* w) { - ARTYPE* t = new ARTYPE[n]; + ARTYPE* t = new ARTYPE[this->n]; MultMtv(v,t); MultMv(t,w); @@ -487,8 +487,8 @@ template void ARumNonSymMatrix::Mult0MMt0v(ARTYPE* v, ARTYPE* w) { - MultMv(&v[m],w); - MultMtv(v,&w[m]); + MultMv(&v[this->m],w); + MultMtv(v,&w[this->m]); } // Mult0MMt0v. @@ -506,9 +506,9 @@ void ARumNonSymMatrix:: // Solving A.w = v (or AsI.w = v). - ARTYPE* space = new ARTYPE[2*n]; + ARTYPE* space = new ARTYPE[2*this->n]; - um2so(n, 0, false, lvalue, lindex, value, index, + um2so(this->n, 0, false, lvalue, lindex, value, index, keep, v, w, space, cntl, icntl, info, rinfo); delete[] space; @@ -525,13 +525,13 @@ DefineMatrix(int np, int nnzp, ARTYPE* a // Defining member variables. - m = np; - n = np; + this->m = np; + this->n = np; nnz = nnzp; a = ap; irow = irowp; pcol = pcolp; - pcol[n] = nnz; + pcol[this->n] = nnz; fillin = (fillinp>2) ? fillinp : 2; threshold = thresholdp; value = NULL; @@ -548,7 +548,7 @@ DefineMatrix(int np, int nnzp, ARTYPE* a "ARumNonSymMatrix::DefineMatrix"); } else { - defined = true; + this->defined = true; } } // DefineMatrix (square). @@ -561,15 +561,15 @@ DefineMatrix(int mp, int np, int nnzp, A // Defining member variables. - m = mp; - n = np; + this->m = mp; + this->n = np; nnz = nnzp; a = ap; irow = irowp; pcol = pcolp; - pcol[n] = nnz; + pcol[this->n] = nnz; fillin = 0; - defined = true; + this->defined = true; } // DefineMatrix (rectangular). diff -rupN arpack++-2.3.orig/include/aruscomp.h arpack++-2.3/include/aruscomp.h --- arpack++-2.3.orig/include/aruscomp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/aruscomp.h 2010-09-08 15:53:47.523480000 +0200 @@ -18,7 +18,7 @@ #ifndef ARUSCOMP_H #define ARUSCOMP_H -#include +#include #include "arch.h" #include "arscomp.h" #include "arunsmat.h" @@ -84,7 +84,7 @@ inline void ARluCompStdEig:: ChangeShift(arcomplex sigmaRp) { - objOP->FactorAsI(sigmaRp); + this->objOP->FactorAsI(sigmaRp); ARrcStdEig >::ChangeShift(sigmaRp); } // ChangeShift. @@ -96,7 +96,7 @@ inline void ARluCompStdEig::Set ARStdEig, ARumNonSymMatrix, ARFLOAT> >:: - SetRegularMode(objOP, + SetRegularMode(this->objOP, &ARumNonSymMatrix, ARFLOAT>::MultMv); } // SetRegularMode. @@ -109,7 +109,7 @@ SetShiftInvertMode(arcomplex si ARStdEig, ARumNonSymMatrix, ARFLOAT> >:: - SetShiftInvertMode(sigmap, objOP, + SetShiftInvertMode(sigmap, this->objOP, &ARumNonSymMatrix,ARFLOAT>::MultInvv); } // SetShiftInvertMode. @@ -123,7 +123,7 @@ ARluCompStdEig(int nevp, ARumNonSymMatri { - NoShift(); + this->NoShift(); DefineParameters(A.ncols(), nevp, &A, &ARumNonSymMatrix, ARFLOAT>::MultMv, whichp, ncvp, tolp, maxitp, residp, ishiftp); @@ -154,7 +154,7 @@ operator=(const ARluCompStdEig& { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/arusmat.h arpack++-2.3/include/arusmat.h --- arpack++-2.3.orig/include/arusmat.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arusmat.h 2010-09-08 15:53:35.083481000 +0200 @@ -20,7 +20,7 @@ #ifndef ARUSMAT_H #define ARUSMAT_H -#include +#include #include "arch.h" #include "armat.h" #include "arhbmat.h" @@ -125,12 +125,12 @@ bool ARumSymMatrix::DataOK() // Checking if pcol is in ascending order. i = 0; - while ((i!=n)&&(pcol[i]<=pcol[i+1])) i++; - if (i!=n) return false; + while ((i!=this->n)&&(pcol[i]<=pcol[i+1])) i++; + if (i!=this->n) return false; // Checking if irow components are in order and within bounds. - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { j = pcol[i]; k = pcol[i+1]-1; if (j<=k) { @@ -138,7 +138,7 @@ bool ARumSymMatrix::DataOK() if ((irow[j]<0)||(irow[k]>i)) return false; } else { // uplo == 'L'. - if ((irow[j]=n)) return false; + if ((irow[j]=this->n)) return false; } while ((j!=k)&&(irow[j]::Copy(const A // Copying very fundamental variables and user-defined parameters. - m = other.m; - n = other.n; - defined = other.defined; + this->m = other.m; + this->n = other.n; + this->defined = other.defined; factored = other.factored; fillin = other.fillin; nnz = other.nnz; @@ -190,7 +190,7 @@ void ARumSymMatrix::Copy(const A // Returning from here if "other" was not initialized. - if (!defined) return; + if (!this->defined) return; // Copying arrays with static dimension. @@ -226,13 +226,13 @@ void ARumSymMatrix::ExpandA(ARTY // Filling index with zeros. - for (i=0; i<=n; i++) index[i] = 0; + for (i=0; i<=this->n; i++) index[i] = 0; // Counting the elements in each column of A. if (uplo == 'U') { - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { k = pcol[i+1]; if ((k!=pcol[i])&&(irow[k-1]==i)) { k--; @@ -246,7 +246,7 @@ void ARumSymMatrix::ExpandA(ARTY } else { // uplo == 'L' - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { k = pcol[i]; if ((k!=pcol[i+1])&&(irow[k]==i)) { k++; @@ -261,20 +261,20 @@ void ARumSymMatrix::ExpandA(ARTY // Summing up index elements. - for (i=0; in; i++) index[i+1]+=index[i]; // Adding pcol to index. - for (i=n; i>0; i--) index[i] = index[i-1]+pcol[i]; + for (i=this->n; i>0; i--) index[i] = index[i-1]+pcol[i]; index[0] = pcol[0]; // Expanding A. - ki = n+1; + ki = this->n+1; if (uplo == 'U') { - for (i=0; in; i++) { for (j=pcol[i]; j<(pcol[i+1]-1); j++) { index[ki+index[i]] = irow[j]+1; index[ki+index[irow[j]]] = i+1; @@ -301,7 +301,7 @@ void ARumSymMatrix::ExpandA(ARTY } else { // uplo == 'L' - for (i=0; in; i++) { k=pcol[i]; if ((k!=pcol[i+1])&&(irow[k]==i)) { index[ki+index[i]] = i+1; @@ -331,7 +331,7 @@ void ARumSymMatrix::ExpandA(ARTY // Adjusting index. - for (i=n; i>0; i--) { + for (i=this->n; i>0; i--) { index[i] = index[i-1]+1; } index[0] = 1; @@ -343,11 +343,11 @@ template inline void ARumSymMatrix::CreateStructure() { - int dimfact = (((fillin+1)*nnz*2)<(n*n)) ? (fillin+1)*nnz*2 : n*n; + int dimfact = (((fillin+1)*nnz*2)<(this->n*this->n)) ? (fillin+1)*nnz*2 : this->n*this->n; ClearMem(); - lindex = 30*n+dimfact; // ????? + lindex = 30*this->n+dimfact; // ????? lvalue = dimfact; value = new ARTYPE[lvalue]; @@ -382,7 +382,7 @@ void ARumSymMatrix::FactorA() // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARumSymMatrix::FactorA"); } @@ -396,7 +396,7 @@ void ARumSymMatrix::FactorA() // Decomposing A. - um2fa(n, index[n], 0, false, lvalue, lindex, value, + um2fa(this->n, index[this->n], 0, false, lvalue, lindex, value, index, keep, cntl, icntl, info, rinfo); // Handling errors. @@ -414,7 +414,7 @@ void ARumSymMatrix::FactorAsI(AR // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARumSymMatrix::FactorAsI"); } @@ -428,7 +428,7 @@ void ARumSymMatrix::FactorAsI(AR // Decomposing AsI. - um2fa(n, index[n], 0, false, lvalue, lindex, value, + um2fa(this->n, index[this->n], 0, false, lvalue, lindex, value, index, keep, cntl, icntl, info, rinfo); // Handling errors. @@ -449,17 +449,17 @@ void ARumSymMatrix::MultMv(ARTYP // Quitting the function if A was not defined. - if (!IsDefined()) { + if (!this->IsDefined()) { throw ArpackError(ArpackError::DATA_UNDEFINED, "ARumSymMatrix::MultMv"); } // Determining w = M.v. - for (i=0; i!=m; i++) w[i]=(ARTYPE)0; + for (i=0; i!=this->m; i++) w[i]=(ARTYPE)0; if (uplo == 'U') { - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { t = v[i]; k = pcol[i+1]; if ((k!=pcol[i])&&(irow[k-1]==i)) { @@ -475,7 +475,7 @@ void ARumSymMatrix::MultMv(ARTYP } else { - for (i=0; i!=n; i++) { + for (i=0; i!=this->n; i++) { t = v[i]; k = pcol[i]; if ((k!=pcol[i+1])&&(irow[k]==i)) { @@ -506,9 +506,9 @@ void ARumSymMatrix::MultInvv(ART // Solving A.w = v (or AsI.w = v). - ARTYPE* space = new ARTYPE[2*n]; + ARTYPE* space = new ARTYPE[2*this->n]; - um2so(n, 0, false, lvalue, lindex, value, index, + um2so(this->n, 0, false, lvalue, lindex, value, index, keep, v, w, space, cntl, icntl, info, rinfo); delete[] space; @@ -525,13 +525,13 @@ DefineMatrix(int np, int nnzp, ARTYPE* a // Defining member variables. - m = np; - n = np; + this->m = np; + this->n = np; nnz = nnzp; a = ap; irow = irowp; pcol = pcolp; - pcol[n] = nnz; + pcol[this->n] = nnz; uplo = uplop; fillin = (fillinp>2) ? fillinp : 2; threshold = thresholdp; @@ -549,7 +549,7 @@ DefineMatrix(int np, int nnzp, ARTYPE* a "ARumSymMatrix::DefineMatrix"); } else { - defined = true; + this->defined = true; } } // DefineMatrix. diff -rupN arpack++-2.3.orig/include/arusnsym.h arpack++-2.3/include/arusnsym.h --- arpack++-2.3.orig/include/arusnsym.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/arusnsym.h 2010-09-08 15:51:47.683481000 +0200 @@ -18,7 +18,7 @@ #ifndef ARUSNSYM_H #define ARUSNSYM_H -#include +#include #include "arch.h" #include "arsnsym.h" #include "arunsmat.h" @@ -80,13 +80,13 @@ template inline void ARluNonSymStdEig::ChangeShift(ARFLOAT sigmaRp) { - sigmaR = sigmaRp; - sigmaI = 0.0; - mode = 3; - iparam[7] = mode; + this->sigmaR = sigmaRp; + this->sigmaI = 0.0; + this->mode = 3; + this->iparam[7] = this->mode; - objOP->FactorAsI(sigmaR); - Restart(); + this->objOP->FactorAsI(this->sigmaR); + this->Restart(); } // ChangeShift. @@ -96,7 +96,7 @@ inline void ARluNonSymStdEig::S { ARStdEig >:: - SetRegularMode(objOP, &ARumNonSymMatrix::MultMv); + SetRegularMode(this->objOP, &ARumNonSymMatrix::MultMv); } // SetRegularMode. @@ -106,7 +106,7 @@ inline void ARluNonSymStdEig::S { ARStdEig >:: - SetShiftInvertMode(sigmap, objOP, + SetShiftInvertMode(sigmap, this->objOP, &ARumNonSymMatrix::MultInvv); } // SetShiftInvertMode. @@ -120,7 +120,7 @@ ARluNonSymStdEig(int nevp, ARumNonSymMat { - NoShift(); + this->NoShift(); DefineParameters(A.ncols(), nevp, &A, &ARumNonSymMatrix::MultMv, whichp, ncvp, tolp, maxitp, residp, ishiftp); @@ -150,7 +150,7 @@ operator=(const ARluNonSymStdEigClearMem(); Copy(other); } return *this; @@ -159,4 +159,3 @@ operator=(const ARluNonSymStdEig +#include #include "arch.h" #include "arssym.h" #include "arusmat.h" @@ -80,13 +80,13 @@ template inline void ARluSymStdEig::ChangeShift(ARFLOAT sigmaRp) { - sigmaR = sigmaRp; - sigmaI = 0.0; - mode = 3; - iparam[7] = mode; + this->sigmaR = sigmaRp; + this->sigmaI = 0.0; + this->mode = 3; + this->iparam[7] = this->mode; - objOP->FactorAsI(sigmaR); - Restart(); + this->objOP->FactorAsI(this->sigmaR); + this->Restart(); } // ChangeShift. @@ -96,7 +96,7 @@ inline void ARluSymStdEig::SetR { ARStdEig >:: - SetRegularMode(objOP, &ARumSymMatrix::MultMv); + SetRegularMode(this->objOP, &ARumSymMatrix::MultMv); } // SetRegularMode. @@ -106,7 +106,7 @@ inline void ARluSymStdEig::SetS { ARStdEig >:: - SetShiftInvertMode(sigmap, objOP, &ARumSymMatrix::MultInvv); + SetShiftInvertMode(sigmap, this->objOP, &ARumSymMatrix::MultInvv); } // SetShiftInvertMode. @@ -118,7 +118,7 @@ ARluSymStdEig(int nevp, ARumSymMatrixNoShift(); DefineParameters(A.ncols(), nevp, &A, &ARumSymMatrix::MultMv, whichp, ncvp, tolp, maxitp, residp, ishiftp); @@ -146,7 +146,7 @@ operator=(const ARluSymStdEig& { if (this != &other) { // Stroustrup suggestion. - ClearMem(); + this->ClearMem(); Copy(other); } return *this; diff -rupN arpack++-2.3.orig/include/ceupp.h arpack++-2.3/include/ceupp.h --- arpack++-2.3.orig/include/ceupp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/ceupp.h 2010-09-08 15:49:00.423481000 +0200 @@ -17,7 +17,7 @@ #ifndef CEUPP_H #define CEUPP_H -#include +#include #include "arch.h" #include "arpackf.h" diff -rupN arpack++-2.3.orig/include/neupp.h arpack++-2.3/include/neupp.h --- arpack++-2.3.orig/include/neupp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/neupp.h 2010-09-08 15:48:47.793481000 +0200 @@ -17,7 +17,7 @@ #ifndef NEUPP_H #define NEUPP_H -#include +#include #include "arch.h" #include "arpackf.h" diff -rupN arpack++-2.3.orig/include/seupp.h arpack++-2.3/include/seupp.h --- arpack++-2.3.orig/include/seupp.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/seupp.h 2010-09-08 15:48:34.243481000 +0200 @@ -17,7 +17,7 @@ #ifndef SEUPP_H #define SEUPP_H -#include +#include #include "arch.h" #include "arpackf.h" diff -rupN arpack++-2.3.orig/include/superluc.h arpack++-2.3/include/superluc.h --- arpack++-2.3.orig/include/superluc.h 2006-07-07 15:06:11.000000000 +0200 +++ arpack++-2.3/include/superluc.h 2010-09-08 21:49:43.023481002 +0200 @@ -24,7 +24,7 @@ // gstrf. -inline void gstrf(char* refact, SuperMatrix* A, double diag_pivot_thresh, +inline void gstrf(const char* refact, SuperMatrix* A, double diag_pivot_thresh, double drop_tol, int relax, int panel_size, int* etree, void* work, int lwork, int* perm_r, int *perm_c, SuperMatrix *L, SuperMatrix *U, int *info) @@ -54,7 +54,7 @@ inline void gstrf(char* refact, SuperMat } // gstrf. -inline void gstrs(char *trans, SuperMatrix *L, SuperMatrix *U, +inline void gstrs(const char *trans, SuperMatrix *L, SuperMatrix *U, int *perm_r, int *perm_c, SuperMatrix *B, int *info) { debian/patches/series0000664000000000000000000000001511616210361012025 0ustar arlsmat.diff debian/watch0000664000000000000000000000014111616202525010215 0ustar version=3 http://ljk.imag.fr/membres/Christophe.Prudhomme/software/ arpack\+\+-([\d.]+)\.tar\.gz debian/arpack++.doc-base0000664000000000000000000000035611616205362012164 0ustar Document: arpack++ Title: ARPACK++ Documentation Author: Danny Sorensen, F.M Gomez Abstract: ARPACK++ is an object-oriented version of the ARPACK package. Section: Devel Format: Postscript Files: /usr/share/doc/arpack++/arpackpp.ps.gz debian/README.debian0000664000000000000000000000046011616205362011273 0ustar Arpack++ for Debian ---------------------- Arpack++ was downloaded on Mon, 4 Feb 2002 19:50:51 -0500. Since then I have applied numerous patches to update arpack++ to standard c++ code and make compile on recent g++ versions. Christophe Prud'homme , Mon, 4 Feb 2002 19:50:51 -0500 debian/control0000664000000000000000000000421712266311302010573 0ustar Source: arpack++ Homepage: http://ljk.imag.fr/membres/Christophe.Prudhomme/software.php Section: devel Priority: optional Build-Depends: cdbs, debhelper ( >> 4.1.0 ), gfortran, libblas-dev, liblapack-dev, libarpack2-dev, chrpath, dh-autoreconf Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Science Team Uploaders: Christophe Prud'homme Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/arpack++/ Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/arpack++/ Package: libarpack++2c2a Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: arpack++, libarpack++2, libarpack++2c2 Replaces: libarpack++2, libarpack++2c2 Description: Object-oriented version of the ARPACK package (runtime) ARPACK++ is an object-oriented version of the ARPACK package. It consists a collection of classes that offers c++ programmers an interface to ARPACK. It preserves the full capability, performance, accuracy and low memory requirements of the FORTRAN package, but takes advantage of the c++ object-oriented programming environment. . ARPACK stands for ARnoldi PACKage and provides standard and generalized eigenvalue solvers for sparse matrices that arises typically from finite element codes. See the corresponding Debian package. Package: libarpack++2-dev Section: libdevel Architecture: any Depends: libarpack++2c2a (= ${binary:Version}), libarpack2-dev, ${misc:Depends} Description: Object-oriented version of the ARPACK package (development) ARPACK++ is an object-oriented version of the ARPACK package. It consists a collection of classes that offers c++ programmers an interface to ARPACK. It preserves the full capability, performance, accuracy and low memory requirements of the FORTRAN package, but takes advantage of the c++ object-oriented programming environment. . ARPACK stands for ARnoldi PACKage and provides standard and generalized eigenvalue solvers for sparse matrices that arises typically from finite element codes. See the corresponding Debian package. debian/libarpack++2-dev.install0000664000000000000000000000015111616205362013473 0ustar debian/tmp/usr/lib/libarpack++.a debian/tmp/usr/lib/libarpack++.so debian/tmp/usr/include/arpack++/*.h debian/source/0000775000000000000000000000000011616203450010466 5ustar debian/source/format0000664000000000000000000000001411616203352011675 0ustar 3.0 (quilt) debian/rules0000775000000000000000000000207312266310555010257 0ustar #!/usr/bin/make -f DEB_AUTO_CLEANUP_RCS := yes DEB_BUILDDIR := $(DEB_SRCDIR)/ DEB_CONFIGURE_SCRIPT := $(DEB_SRCDIR)/configure DEB_MAKE_CLEAN_TARGET := clean DEB_COMPRESS_EXCLUDE := .pdf DEB_INSTALL_EXAMPLES_libarpack++2-dev:=examples/* include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/autoreconf.mk DEB_BUILDDIR := $(DEB_SRCDIR)/ DEB_CONFIGURE_SCRIPT := $(CURDIR)/configure DEB_CONFIGURE_EXTRA_FLAGS := \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --includedir=/usr/include/arpack++ #CXX=/usr/lib/gcc-snapshot/bin/g++ #CC=/usr/lib/gcc-snapshot/bin/gcc CFLAGS= -O3 CXXFLAGS= -O3 FFLAGS= -O3 VERSION=2.3 orig-tarball: mkdir tmp; \ cd tmp; \ wget http://ljk.imag.fr/membres/Christophe.Prudhomme/software/arpack++-${VERSION}.tar.gz; \ mv arpack++-${VERSION}.tar.gz ../arpack++_${VERSION}.orig.tar.gz; \ cd ..; \ rmdir tmp