From: Mark Gates Date: Mon, 17 Oct 2016 18:10:48 +0000 (-0400) Subject: make SY/HE imat match LAWN 41 (different than PO) X-Git-Tag: accepted/tizen/5.0/unified/20181102.024111~119^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=556f29245404e2bdf6a5bf1148042e3fbf81f40a;p=platform%2Fupstream%2Flapack.git make SY/HE imat match LAWN 41 (different than PO) --- diff --git a/TESTING/LIN/clatb4.f b/TESTING/LIN/clatb4.f index 274179b..c936f90 100644 --- a/TESTING/LIN/clatb4.f +++ b/TESTING/LIN/clatb4.f @@ -340,12 +340,10 @@ ANORM = ONE END IF * - ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) .OR. - $ LSAMEN( 2, C2, 'HE' ) .OR. LSAMEN( 2, C2, 'HP' ) .OR. - $ LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN + ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) ) THEN * -* xPO, xPP, xHE, xHP, xSY, xSP: Set parameters to generate a -* symmetric or Hermitian matrix. +* xPO, xPP: Set parameters to generate a +* symmetric or Hermitian positive definite matrix. * * Set TYPE, the type of matrix to be generated. * @@ -378,6 +376,43 @@ ANORM = ONE END IF * + ELSE IF( LSAMEN( 2, C2, 'HE' ) .OR. LSAMEN( 2, C2, 'HP' ) .OR. + $ LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN +* +* xHE, xHP, xSY, xSP: Set parameters to generate a +* symmetric or Hermitian matrix. +* +* Set TYPE, the type of matrix to be generated. +* + TYPE = C2( 1: 1 ) +* +* Set the lower and upper bandwidths. +* + IF( IMAT.EQ.1 ) THEN + KL = 0 + ELSE + KL = MAX( N-1, 0 ) + END IF + KU = KL +* +* Set the condition number and norm. +* + IF( IMAT.EQ.7 ) THEN + CNDNUM = BADC1 + ELSE IF( IMAT.EQ.8 ) THEN + CNDNUM = BADC2 + ELSE + CNDNUM = TWO + END IF +* + IF( IMAT.EQ.9 ) THEN + ANORM = SMALL + ELSE IF( IMAT.EQ.10 ) THEN + ANORM = LARGE + ELSE + ANORM = ONE + END IF +* ELSE IF( LSAMEN( 2, C2, 'PB' ) ) THEN * * xPB: Set parameters to generate a symmetric band matrix. diff --git a/TESTING/LIN/dlatb4.f b/TESTING/LIN/dlatb4.f index e1638b0..7eb1fa4 100644 --- a/TESTING/LIN/dlatb4.f +++ b/TESTING/LIN/dlatb4.f @@ -339,11 +339,10 @@ ANORM = ONE END IF * - ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) .OR. - $ LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN + ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) ) THEN * -* xPO, xPP, xSY, xSP: Set parameters to generate a -* symmetric matrix. +* xPO, xPP: Set parameters to generate a +* symmetric positive definite matrix. * * Set TYPE, the type of matrix to be generated. * @@ -376,6 +375,43 @@ ANORM = ONE END IF * +* + ELSE IF( LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN +* +* xSY, xSP: Set parameters to generate a +* symmetric matrix. +* +* Set TYPE, the type of matrix to be generated. +* + TYPE = C2( 1: 1 ) +* +* Set the lower and upper bandwidths. +* + IF( IMAT.EQ.1 ) THEN + KL = 0 + ELSE + KL = MAX( N-1, 0 ) + END IF + KU = KL +* +* Set the condition number and norm. +* + IF( IMAT.EQ.7 ) THEN + CNDNUM = BADC1 + ELSE IF( IMAT.EQ.8 ) THEN + CNDNUM = BADC2 + ELSE + CNDNUM = TWO + END IF +* + IF( IMAT.EQ.9 ) THEN + ANORM = SMALL + ELSE IF( IMAT.EQ.10 ) THEN + ANORM = LARGE + ELSE + ANORM = ONE + END IF +* ELSE IF( LSAMEN( 2, C2, 'PB' ) ) THEN * * xPB: Set parameters to generate a symmetric band matrix. diff --git a/TESTING/LIN/slatb4.f b/TESTING/LIN/slatb4.f index 4ead31d..145c65d 100644 --- a/TESTING/LIN/slatb4.f +++ b/TESTING/LIN/slatb4.f @@ -339,11 +339,10 @@ ANORM = ONE END IF * - ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) .OR. - $ LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN + ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) ) THEN * * xPO, xPP, xSY, xSP: Set parameters to generate a -* symmetric matrix. +* symmetric positive definite matrix. * * Set TYPE, the type of matrix to be generated. * @@ -376,6 +375,43 @@ ANORM = ONE END IF * +* + ELSE IF( LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN +* +* xSY, xSP: Set parameters to generate a +* symmetric matrix. +* +* Set TYPE, the type of matrix to be generated. +* + TYPE = C2( 1: 1 ) +* +* Set the lower and upper bandwidths. +* + IF( IMAT.EQ.1 ) THEN + KL = 0 + ELSE + KL = MAX( N-1, 0 ) + END IF + KU = KL +* +* Set the condition number and norm. +* + IF( IMAT.EQ.7 ) THEN + CNDNUM = BADC1 + ELSE IF( IMAT.EQ.8 ) THEN + CNDNUM = BADC2 + ELSE + CNDNUM = TWO + END IF +* + IF( IMAT.EQ.9 ) THEN + ANORM = SMALL + ELSE IF( IMAT.EQ.10 ) THEN + ANORM = LARGE + ELSE + ANORM = ONE + END IF +* ELSE IF( LSAMEN( 2, C2, 'PB' ) ) THEN * * xPB: Set parameters to generate a symmetric band matrix. diff --git a/TESTING/LIN/zlatb4.f b/TESTING/LIN/zlatb4.f index bcfa234..de26637 100644 --- a/TESTING/LIN/zlatb4.f +++ b/TESTING/LIN/zlatb4.f @@ -340,12 +340,10 @@ ANORM = ONE END IF * - ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) .OR. - $ LSAMEN( 2, C2, 'HE' ) .OR. LSAMEN( 2, C2, 'HP' ) .OR. - $ LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN + ELSE IF( LSAMEN( 2, C2, 'PO' ) .OR. LSAMEN( 2, C2, 'PP' ) ) THEN * -* xPO, xPP, xHE, xHP, xSY, xSP: Set parameters to generate a -* symmetric or Hermitian matrix. +* xPO, xPP: Set parameters to generate a +* symmetric or Hermitian positive definite matrix. * * Set TYPE, the type of matrix to be generated. * @@ -378,6 +376,43 @@ ANORM = ONE END IF * + ELSE IF( LSAMEN( 2, C2, 'HE' ) .OR. LSAMEN( 2, C2, 'HP' ) .OR. + $ LSAMEN( 2, C2, 'SY' ) .OR. LSAMEN( 2, C2, 'SP' ) ) THEN +* +* xHE, xHP, xSY, xSP: Set parameters to generate a +* symmetric or Hermitian matrix. +* +* Set TYPE, the type of matrix to be generated. +* + TYPE = C2( 1: 1 ) +* +* Set the lower and upper bandwidths. +* + IF( IMAT.EQ.1 ) THEN + KL = 0 + ELSE + KL = MAX( N-1, 0 ) + END IF + KU = KL +* +* Set the condition number and norm. +* + IF( IMAT.EQ.7 ) THEN + CNDNUM = BADC1 + ELSE IF( IMAT.EQ.8 ) THEN + CNDNUM = BADC2 + ELSE + CNDNUM = TWO + END IF +* + IF( IMAT.EQ.9 ) THEN + ANORM = SMALL + ELSE IF( IMAT.EQ.10 ) THEN + ANORM = LARGE + ELSE + ANORM = ONE + END IF +* ELSE IF( LSAMEN( 2, C2, 'PB' ) ) THEN * * xPB: Set parameters to generate a symmetric band matrix.