Merge branch 'develop' into feat/migrate-dmedian-sorted

Author: Neerajpathak07

lib/node_modules/@stdlib/blas/base/dtrmv/lib/dtrmv.js

@@ -21,10 +21,10 @@
 // MODULES //
 
 var max = require( '@stdlib/math/base/special/fast/max' );
-var isLayout = require( '@stdlib/blas/base/assert/is-layout' );
-var isMatrixTriangle = require( '@stdlib/blas/base/assert/is-matrix-triangle' );
-var isTransposeOperation = require( '@stdlib/blas/base/assert/is-transpose-operation' );
-var isDiagonal = require( '@stdlib/blas/base/assert/is-diagonal-type' );
+var resolveLayout = require( '@stdlib/blas/base/layout-resolve-str' );
+var resolveTriangle = require( '@stdlib/blas/base/matrix-triangle-resolve-str' );
+var resolveTranspose = require( '@stdlib/blas/base/transpose-operation-resolve-str' );
+var resolveDiagonal = require( '@stdlib/blas/base/diagonal-type-resolve-str' );
 var isColumnMajor = require( '@stdlib/ndarray/base/assert/is-column-major-string' );
 var stride2offset = require( '@stdlib/strided/base/stride2offset' );
 var format = require( '@stdlib/string/format' );
@@ -36,10 +36,10 @@ var base = require( './base.js' );
 /**
 * Performs one of the matrix-vector operations `x = A*x` or `x = A^T*x`, where `x` is an `N` element vector and `A` is an `N` by `N` unit, or non-unit, upper or lower triangular matrix.
 *
-* @param {string} order - storage layout
-* @param {string} uplo - specifies whether `A` is an upper or lower triangular matrix
-* @param {string} trans - specifies whether `A` should be transposed, conjugate-transposed, or not transposed
-* @param {string} diag - specifies whether `A` has a unit diagonal
+* @param {(integer|string)} order - storage layout
+* @param {(integer|string)} uplo - specifies whether `A` is an upper or lower triangular matrix
+* @param {(integer|string)} trans - specifies whether `A` should be transposed, conjugate-transposed, or not transposed
+* @param {(integer|string)} diag - specifies whether `A` has a unit diagonal
 * @param {NonNegativeInteger} N - number of elements along each dimension of `A`
 * @param {Float64Array} A - input matrix
 * @param {integer} LDA - stride of the first dimension of `A` (a.k.a., leading dimension of the matrix `A`)
@@ -67,17 +67,25 @@ function dtrmv( order, uplo, trans, diag, N, A, LDA, x, strideX ) {
 	var sa1;
 	var sa2;
 	var ox;
+	var l;
+	var u;
+	var t;
+	var d;
 
-	if ( !isLayout( order ) ) {
+	l = resolveLayout( order );
+	if ( l === null ) {
 		throw new TypeError( format( 'invalid argument. First argument must be a valid order. Value: `%s`.', order ) );
 	}
-	if ( !isMatrixTriangle( uplo ) ) {
+	u = resolveTriangle( uplo );
+	if ( u === null ) {
 		throw new TypeError( format( 'invalid argument. Second argument must specify whether the lower or upper triangular matrix is supplied. Value: `%s`.', uplo ) );
 	}
-	if ( !isTransposeOperation( trans ) ) {
+	t = resolveTranspose( trans );
+	if ( t === null ) {
 		throw new TypeError( format( 'invalid argument. Third argument must be a valid transpose operation. Value: `%s`.', trans ) );
 	}
-	if ( !isDiagonal( diag ) ) {
+	d = resolveDiagonal( diag );
+	if ( d === null ) {
 		throw new TypeError( format( 'invalid argument. Fourth argument must be a valid diagonal type. Value: `%s`.', diag ) );
 	}
 	if ( N < 0 ) {
@@ -92,15 +100,15 @@ function dtrmv( order, uplo, trans, diag, N, A, LDA, x, strideX ) {
 	if ( N === 0 ) {
 		return x;
 	}
-	if ( isColumnMajor( order ) ) {
+	if ( isColumnMajor( l ) ) {
 		sa1 = 1;
 		sa2 = LDA;
 	} else { // order === 'row-major'
 		sa1 = LDA;
 		sa2 = 1;
 	}
 	ox = stride2offset( N, strideX );
-	return base( uplo, trans, diag, N, A, sa1, sa2, 0, x, strideX, ox );
+	return base( u, t, d, N, A, sa1, sa2, 0, x, strideX, ox );
 }
 
 

lib/node_modules/@stdlib/blas/base/dtrmv/lib/ndarray.js

@@ -20,9 +20,9 @@
 
 // MODULES //
 
-var isMatrixTriangle = require( '@stdlib/blas/base/assert/is-matrix-triangle' );
-var isTransposeOperation = require( '@stdlib/blas/base/assert/is-transpose-operation' );
-var isDiagonal = require( '@stdlib/blas/base/assert/is-diagonal-type' );
+var resolveTriangle = require( '@stdlib/blas/base/matrix-triangle-resolve-str' );
+var resolveTranspose = require( '@stdlib/blas/base/transpose-operation-resolve-str' );
+var resolveDiagonal = require( '@stdlib/blas/base/diagonal-type-resolve-str' );
 var format = require( '@stdlib/string/format' );
 var base = require( './base.js' );
 
@@ -32,9 +32,9 @@ var base = require( './base.js' );
 /**
 * Performs one of the matrix-vector operations `x = A*x` or `x = A^T*x`, where `x` is an `N` element vector and `A` is an `N` by `N` unit, or non-unit, upper or lower triangular matrix.
 *
-* @param {string} uplo - specifies whether `A` is an upper or lower triangular matrix
-* @param {string} trans - specifies whether `A` should be transposed, conjugate-transposed, or not transposed
-* @param {string} diag - specifies whether `A` has a unit diagonal
+* @param {(integer|string)} uplo - specifies whether `A` is an upper or lower triangular matrix
+* @param {(integer|string)} trans - specifies whether `A` should be transposed, conjugate-transposed, or not transposed
+* @param {(integer|string)} diag - specifies whether `A` has a unit diagonal
 * @param {NonNegativeInteger} N - number of elements along each dimension of `A`
 * @param {Float64Array} A - input matrix
 * @param {integer} strideA1 - stride of the first dimension of `A`
@@ -62,13 +62,20 @@ var base = require( './base.js' );
 * // x => <Float64Array>[ 14.0, 8.0, 3.0 ]
 */
 function dtrmv( uplo, trans, diag, N, A, strideA1, strideA2, offsetA, x, strideX, offsetX ) { // eslint-disable-line max-params, max-len
-	if ( !isMatrixTriangle( uplo ) ) {
+	var u;
+	var t;
+	var d;
+
+	u = resolveTriangle( uplo );
+	if ( u === null ) {
 		throw new TypeError( format( 'invalid argument. First argument must specify whether the lower or upper triangular matrix is supplied. Value: `%s`.', uplo ) );
 	}
-	if ( !isTransposeOperation( trans ) ) {
+	t = resolveTranspose( trans );
+	if ( t === null ) {
 		throw new TypeError( format( 'invalid argument. Second argument must be a valid transpose operation. Value: `%s`.', trans ) );
 	}
-	if ( !isDiagonal( diag ) ) {
+	d = resolveDiagonal( diag );
+	if ( d === null ) {
 		throw new TypeError( format( 'invalid argument. Third argument must be a valid diagonal type. Value: `%s`.', diag ) );
 	}
 	if ( N < 0 ) {
@@ -86,7 +93,7 @@ function dtrmv( uplo, trans, diag, N, A, strideA1, strideA2, offsetA, x, strideX
 	if ( N === 0 ) {
 		return x;
 	}
-	return base( uplo, trans, diag, N, A, strideA1, strideA2, offsetA, x, strideX, offsetX ); // eslint-disable-line max-len
+	return base( u, t, d, N, A, strideA1, strideA2, offsetA, x, strideX, offsetX ); // eslint-disable-line max-len
 }