Skip to content

Commit 1a526a6

Browse files
committed
refactor: apply suggestions from code review
1 parent 322365b commit 1a526a6

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

lib/node_modules/@stdlib/ndarray/concat1d/docs/types/index.d.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@ interface Concat1d {
3838
* @example
3939
* var array = require( '@stdlib/ndarray/array' );
4040
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
41-
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
4241
*
4342
* var x = array( [ -1.0, 2.0, 3.0, 4.0 ] );
4443
* var y = array( [ -5.0, 6.0, -7.0, -8.0, 9.0, -10.0 ] );
4544
*
46-
* var out = concat1d( [ x, y ] );
45+
* var out = concat1d( x, y );
4746
* // returns <ndarray>
4847
*
4948
* var arr = ndarray2array( out );
@@ -60,7 +59,6 @@ interface Concat1d {
6059
* @example
6160
* var array = require( '@stdlib/ndarray/array' );
6261
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
63-
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
6462
*
6563
* var x = array( [ -1.0, 2.0, 3.0, 4.0 ] );
6664
* var y = array( [ -5.0, 6.0, -7.0, -8.0, 9.0, -10.0 ] );
@@ -125,7 +123,7 @@ interface Concat1d {
125123
* var arr = ndarray2array( z );
126124
* // returns [ -1.0, 2.0, 3.0, 4.0, -5.0, 6.0, -7.0, -8.0, 9.0, -10.0 ]
127125
*/
128-
assign<T = unknown, U = unknown, V extends typedndarray<U> = typedndarray<U>>( ...args: Array<Input<T>> ): V;
126+
assign<T = unknown, U = unknown, V extends typedndarray<U> = typedndarray<U>>( ...args: Array<Input<T> | V> ): V;
129127
}
130128

131129
/**
@@ -137,12 +135,11 @@ interface Concat1d {
137135
* @example
138136
* var array = require( '@stdlib/ndarray/array' );
139137
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
140-
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
141138
*
142139
* var x = array( [ -1.0, 2.0, 3.0, 4.0 ] );
143140
* var y = array( [ -5.0, 6.0, -7.0, -8.0, 9.0, -10.0 ] );
144141
*
145-
* var out = concat1d( [ x, y ] );
142+
* var out = concat1d( x, y );
146143
* // returns <ndarray>
147144
*
148145
* var arr = ndarray2array( out );

lib/node_modules/@stdlib/ndarray/concat1d/lib/assign.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ var isndarrayLike = require( '@stdlib/assert/is-ndarray-like' );
2828
var broadcastArray = require( '@stdlib/ndarray/broadcast-array' );
2929
var format = require( '@stdlib/string/format' );
3030
var defaults = require( '@stdlib/ndarray/defaults' );
31-
var normalizeArrays = require( './normalize_arrays.js' );
3231
var resolveDataTypes = require( './resolve_dtypes.js' );
3332
var resolveOrder = require( './resolve_order.js' );
3433

@@ -44,9 +43,9 @@ var DEFAULT_DTYPE = defaults.get( 'dtypes.default' );
4443
/**
4544
* Concatenates provided input arguments and assigns the result to a provided one-dimensional output ndarray.
4645
*
47-
* @param {...*} args - input arguments
46+
* @param {...*} arguments - input arguments
4847
* @param {ndarray} out - output ndarray
49-
* @throws {Error} function must be provided an array of inputs or more than one separate input arguments and an output ndarray
48+
* @throws {Error} function must be provided an array of inputs or more than one separate input argument and an output ndarray
5049
* @throws {RangeError} function must be provided a one-dimensional ndarray or a zero-dimensional ndarray
5150
* @throws {Error} output argument must be a one-dimensional ndarray-like object
5251
* @returns {ndarray} output ndarray
@@ -83,7 +82,7 @@ function assign() {
8382

8483
// Resolve function arguments...
8584
if ( nargs < 2 ) {
86-
throw new Error( format( 'invalid argument. The function must be provided an array of inputs or more than one separate input arguments and an output ndarray. Value: `%s`.', nargs ) );
85+
throw new Error( format( 'invalid argument. The function must be provided an array of inputs or more than one separate input argument and an output ndarray. Value: `%s`.', nargs ) );
8786
}
8887
if ( nargs > 2 ) {
8988
args = [];
@@ -104,23 +103,26 @@ function assign() {
104103
throw new Error( format( 'invalid argument. Output argument must be a one-dimensional ndarray. Value: `%s`.', out ) );
105104
}
106105

107-
// Resolve the `dtype` and `order` of input ndarrays...
106+
// Resolve the `dtype` and `order` of input ndarrays:
108107
arrs = [];
109108
for ( i = 0; i < args.length; i++ ) {
110109
if ( isndarrayLike( args[ i ] ) ) {
111110
d = ndims( args[ i ] );
112111
if ( d > 1 ) {
113-
throw new RangeError( format( 'invalid argument. The function must be provided a one-dimensional ndarray or a zero-dimensional ndarray.. Value: `%s`.', d ) );
112+
throw new RangeError( format( 'invalid argument. The function must be provided a one-dimensional ndarray or a zero-dimensional ndarray. Value: `%s`.', d ) );
114113
}
115114
arrs.push( args[ i ] );
116115
}
117116
}
118117
if ( arrs.length >= 1 ) {
119118
dt = resolveDataTypes( arrs );
120119
ord = resolveOrder( arrs );
120+
} else {
121+
dt = DEFAULT_DTYPE;
122+
ord = DEFAULT_ORDER;
121123
}
122124

123-
// Broadcast scalar or 0d ndarray inputs...
125+
// Broadcast scalar or 0d ndarray inputs:
124126
for ( i = 0; i < args.length; i++ ) {
125127
if ( isndarrayLike( args[ i ] ) ) {
126128
if ( ndims( args[ i ] ) === 0 ) {
@@ -132,7 +134,7 @@ function assign() {
132134
args[ i ] = broadcastScalar( args[ i ], dt, [ 1 ], ord );
133135
}
134136
}
135-
return concat.assign( normalizeArrays( args ), out );
137+
return concat.assign( args, out );
136138
}
137139

138140

lib/node_modules/@stdlib/ndarray/concat1d/lib/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
* @example
2727
* var array = require( '@stdlib/ndarray/array' );
2828
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
29-
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
3029
* var concat1d = require( '@stdlib/ndarray/concat1d' );
3130
*
3231
* var x = array( [ -1.0, 2.0, 3.0, 4.0 ] );

lib/node_modules/@stdlib/ndarray/concat1d/lib/main.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ var isndarrayLike = require( '@stdlib/assert/is-ndarray-like' );
2828
var broadcastArray = require( '@stdlib/ndarray/broadcast-array' );
2929
var format = require( '@stdlib/string/format' );
3030
var defaults = require( '@stdlib/ndarray/defaults' );
31-
var normalizeArrays = require( './normalize_arrays.js' );
3231
var resolveDataTypes = require( './resolve_dtypes.js' );
3332
var resolveOrder = require( './resolve_order.js' );
3433

@@ -44,15 +43,14 @@ var DEFAULT_DTYPE = defaults.get( 'dtypes.default' );
4443
/**
4544
* Returns a one-dimensional ndarray formed by concatenating the provided input arguments.
4645
*
47-
* @param {...*} args - input arguments
48-
* @throws {Error} function must be provided an array of inputs or more than one separate input arguments
46+
* @param {...*} arguments - input arguments
47+
* @throws {Error} function must be provided an array of inputs or more than one separate input argument
4948
* @throws {RangeError} function must be provided a one-dimensional ndarray or a zero-dimensional ndarray
5049
* @returns {ndarray} output ndarray
5150
*
5251
* @example
5352
* var array = require( '@stdlib/ndarray/array' );
5453
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
55-
* var ndarray2array = require( '@stdlib/ndarray/to-array' );
5654
*
5755
* var x = array( [ -1.0, 2.0, 3.0, 4.0 ] );
5856
* var y = array( [ -5.0, 6.0, -7.0, -8.0, 9.0, -10.0 ] );
@@ -76,7 +74,7 @@ function concat1d() {
7674

7775
// Resolve function arguments...
7876
if ( nargs < 1 ) {
79-
throw new Error( format( 'invalid argument. The function must be provided an array of inputs or more than one separate input arguments. Value: `%s`.', nargs ) );
77+
throw new Error( format( 'invalid argument. The function must be provided an array of inputs or more than one separate input argument. Value: `%s`.', nargs ) );
8078
}
8179
if ( nargs > 1 ) {
8280
args = [];
@@ -93,35 +91,36 @@ function concat1d() {
9391
}
9492
}
9593

96-
// Resolve the `dtype` and `order` of input ndarrays...
94+
// Resolve the `dtype` and `order` of input ndarrays:
9795
arrs = [];
9896
for ( i = 0; i < args.length; i++ ) {
9997
if ( isndarrayLike( args[ i ] ) ) {
10098
d = ndims( args[ i ] );
10199
if ( d > 1 ) {
102-
throw new RangeError( format( 'invalid argument. The function must be provided a one-dimensional ndarray or a zero-dimensional ndarray.. Value: `%s`.', d ) );
100+
throw new RangeError( format( 'invalid argument. The function must be provided a one-dimensional ndarray or a zero-dimensional ndarray. Value: `%s`.', d ) );
103101
}
104102
arrs.push( args[ i ] );
105103
}
106104
}
107105
if ( arrs.length >= 1 ) {
108106
dt = resolveDataTypes( arrs );
109107
ord = resolveOrder( arrs );
108+
} else {
109+
dt = DEFAULT_DTYPE;
110+
ord = DEFAULT_ORDER;
110111
}
111112

112-
// Broadcast scalar or 0d ndarray inputs...
113+
// Broadcast scalar or 0d ndarray inputs:
113114
for ( i = 0; i < args.length; i++ ) {
114115
if ( isndarrayLike( args[ i ] ) ) {
115116
if ( ndims( args[ i ] ) === 0 ) {
116117
args[ i ] = broadcastArray( args[ i ], [ 1 ] );
117118
}
118-
} else if ( !dt && !ord ) {
119-
args[ i ] = broadcastScalar( args[ i ], DEFAULT_DTYPE, [ 1 ], DEFAULT_ORDER ); // eslint-disable-line max-len
120119
} else {
121120
args[ i ] = broadcastScalar( args[ i ], dt, [ 1 ], ord );
122121
}
123122
}
124-
return concat( normalizeArrays( args ) );
123+
return concat( args );
125124
}
126125

127126

lib/node_modules/@stdlib/ndarray/concat1d/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@
6262
"append",
6363
"add",
6464
"concat1d",
65-
"concatenating"
65+
"concatenating",
66+
"join",
67+
"merge",
68+
"combine"
6669
]
6770
}

0 commit comments

Comments
 (0)