diff options
| author | james <james@8a072113-8704-0410-8d35-dd094bca7971> | 2012-07-16 14:21:07 +0000 |
|---|---|---|
| committer | james <james@8a072113-8704-0410-8d35-dd094bca7971> | 2012-07-16 14:21:07 +0000 |
| commit | b0ccd072d7381538a5947bc93908abeabaaf83d8 (patch) | |
| tree | fc3e26f33d620d6968d56441ca92a256a071c3e6 /SRC/dlangt.f | |
| parent | 8989738d77f02c7b50839e69ab8a2ed8aac75024 (diff) | |
| download | lapack-b0ccd072d7381538a5947bc93908abeabaaf83d8.tar.gz lapack-b0ccd072d7381538a5947bc93908abeabaaf83d8.tar.bz2 lapack-b0ccd072d7381538a5947bc93908abeabaaf83d8.zip | |
matrix norms now consistently return nan when input matrix contains a nan;
previously, this was (usually) only the case for the 'F' norm
Diffstat (limited to 'SRC/dlangt.f')
| -rw-r--r-- | SRC/dlangt.f | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/SRC/dlangt.f b/SRC/dlangt.f index 9b77232e..b5e9db2d 100644 --- a/SRC/dlangt.f +++ b/SRC/dlangt.f @@ -127,17 +127,17 @@ * .. * .. Local Scalars .. INTEGER I - DOUBLE PRECISION ANORM, SCALE, SUM + DOUBLE PRECISION ANORM, SCALE, SUM, TEMP * .. * .. External Functions .. - LOGICAL LSAME - EXTERNAL LSAME + LOGICAL LSAME, DISNAN + EXTERNAL LSAME, DISNAN * .. * .. External Subroutines .. EXTERNAL DLASSQ * .. * .. Intrinsic Functions .. - INTRINSIC ABS, MAX, SQRT + INTRINSIC ABS, SQRT * .. * .. Executable Statements .. * @@ -149,9 +149,12 @@ * ANORM = ABS( D( N ) ) DO 10 I = 1, N - 1 - ANORM = MAX( ANORM, ABS( DL( I ) ) ) - ANORM = MAX( ANORM, ABS( D( I ) ) ) - ANORM = MAX( ANORM, ABS( DU( I ) ) ) + IF( ANORM.LT.ABS( DL( I ) ) .OR. DISNAN( ABS( DL( I ) ) ) ) + $ ANORM = ABS(DL(I)) + IF( ANORM.LT.ABS( D( I ) ) .OR. DISNAN( ABS( D( I ) ) ) ) + $ ANORM = ABS(D(I)) + IF( ANORM.LT.ABS( DU( I ) ) .OR. DISNAN (ABS( DU( I ) ) ) ) + $ ANORM = ABS(DU(I)) 10 CONTINUE ELSE IF( LSAME( NORM, 'O' ) .OR. NORM.EQ.'1' ) THEN * @@ -160,11 +163,12 @@ IF( N.EQ.1 ) THEN ANORM = ABS( D( 1 ) ) ELSE - ANORM = MAX( ABS( D( 1 ) )+ABS( DL( 1 ) ), - $ ABS( D( N ) )+ABS( DU( N-1 ) ) ) + ANORM = ABS( D( 1 ) )+ABS( DL( 1 ) ) + TEMP = ABS( D( N ) )+ABS( DU( N-1 ) ) + IF( ANORM .LT. TEMP .OR. DISNAN( TEMP ) ) ANORM = TEMP DO 20 I = 2, N - 1 - ANORM = MAX( ANORM, ABS( D( I ) )+ABS( DL( I ) )+ - $ ABS( DU( I-1 ) ) ) + TEMP = ABS( D( I ) )+ABS( DL( I ) )+ABS( DU( I-1 ) ) + IF( ANORM .LT. TEMP .OR. DISNAN( TEMP ) ) ANORM = TEMP 20 CONTINUE END IF ELSE IF( LSAME( NORM, 'I' ) ) THEN @@ -174,11 +178,12 @@ IF( N.EQ.1 ) THEN ANORM = ABS( D( 1 ) ) ELSE - ANORM = MAX( ABS( D( 1 ) )+ABS( DU( 1 ) ), - $ ABS( D( N ) )+ABS( DL( N-1 ) ) ) + ANORM = ABS( D( 1 ) )+ABS( DU( 1 ) ) + TEMP = ABS( D( N ) )+ABS( DL( N-1 ) ) + IF( ANORM .LT. TEMP .OR. DISNAN( TEMP ) ) ANORM = TEMP DO 30 I = 2, N - 1 - ANORM = MAX( ANORM, ABS( D( I ) )+ABS( DU( I ) )+ - $ ABS( DL( I-1 ) ) ) + TEMP = ABS( D( I ) )+ABS( DU( I ) )+ABS( DL( I-1 ) ) + IF( ANORM .LT. TEMP .OR. DISNAN( TEMP ) ) ANORM = TEMP 30 CONTINUE END IF ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN |