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/clantb.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/clantb.f')
| -rw-r--r-- | SRC/clantb.f | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/SRC/clantb.f b/SRC/clantb.f index 5462dc8e..6517c73a 100644 --- a/SRC/clantb.f +++ b/SRC/clantb.f @@ -167,8 +167,8 @@ REAL SCALE, SUM, VALUE * .. * .. External Functions .. - LOGICAL LSAME - EXTERNAL LSAME + LOGICAL LSAME, SISNAN + EXTERNAL LSAME, SISNAN * .. * .. External Subroutines .. EXTERNAL CLASSQ @@ -189,13 +189,15 @@ IF( LSAME( UPLO, 'U' ) ) THEN DO 20 J = 1, N DO 10 I = MAX( K+2-J, 1 ), K - VALUE = MAX( VALUE, ABS( AB( I, J ) ) ) + SUM = ABS( AB( I, J ) ) + IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM 10 CONTINUE 20 CONTINUE ELSE DO 40 J = 1, N DO 30 I = 2, MIN( N+1-J, K+1 ) - VALUE = MAX( VALUE, ABS( AB( I, J ) ) ) + SUM = ABS( AB( I, J ) ) + IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM 30 CONTINUE 40 CONTINUE END IF @@ -204,13 +206,15 @@ IF( LSAME( UPLO, 'U' ) ) THEN DO 60 J = 1, N DO 50 I = MAX( K+2-J, 1 ), K + 1 - VALUE = MAX( VALUE, ABS( AB( I, J ) ) ) + SUM = ABS( AB( I, J ) ) + IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM 50 CONTINUE 60 CONTINUE ELSE DO 80 J = 1, N DO 70 I = 1, MIN( N+1-J, K+1 ) - VALUE = MAX( VALUE, ABS( AB( I, J ) ) ) + SUM = ABS( AB( I, J ) ) + IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM 70 CONTINUE 80 CONTINUE END IF @@ -234,7 +238,7 @@ SUM = SUM + ABS( AB( I, J ) ) 100 CONTINUE END IF - VALUE = MAX( VALUE, SUM ) + IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM 110 CONTINUE ELSE DO 140 J = 1, N @@ -249,7 +253,7 @@ SUM = SUM + ABS( AB( I, J ) ) 130 CONTINUE END IF - VALUE = MAX( VALUE, SUM ) + IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM 140 CONTINUE END IF ELSE IF( LSAME( NORM, 'I' ) ) THEN @@ -303,7 +307,8 @@ END IF END IF DO 270 I = 1, N - VALUE = MAX( VALUE, WORK( I ) ) + SUM = WORK( I ) + IF( VALUE .LT. SUM .OR. SISNAN( SUM ) ) VALUE = SUM 270 CONTINUE ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN * |