Skip to content

Commit 16d2a1c

Browse files
committed
Auto-generated commit
1 parent 9b41249 commit 16d2a1c

File tree

8 files changed

+59
-152
lines changed

8 files changed

+59
-152
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,7 @@ A total of 45 issues were closed in this release:
817817

818818
<details>
819819

820+
- [`7ab721b`](https://github.com/stdlib-js/stdlib/commit/7ab721ba37db35ef62c6b658ba6ddeef4f8bff64) - **test:** use accessor functions for accessing ndarray meta data _(by Athan Reines)_
820821
- [`1c769c9`](https://github.com/stdlib-js/stdlib/commit/1c769c983b0a4197ba30c9372568e03af00e9c00) - **test:** use accessors for retrieving ndarray meta data _(by Athan Reines)_
821822
- [`06b39a8`](https://github.com/stdlib-js/stdlib/commit/06b39a8dce95540bd60183f40f7afe51a0affdc7) - **refactor:** update to accommodate dtype instances _(by Athan Reines)_
822823
- [`ba129b3`](https://github.com/stdlib-js/stdlib/commit/ba129b35eed5099aece6caa686c3794e9a6b08b5) - **docs:** update namespace table of contents [(#11198)](https://github.com/stdlib-js/stdlib/pull/11198) _(by stdlib-bot)_

base/maybe-broadcast-arrays/README.md

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,34 +91,23 @@ var out = maybeBroadcastArrays( [ x, y ] );
9191
```javascript
9292
var array = require( '@stdlib/ndarray/array' );
9393
var zeros = require( '@stdlib/ndarray/zeros' );
94-
var numel = require( '@stdlib/ndarray/base/numel' );
95-
var ind2sub = require( '@stdlib/ndarray/ind2sub' );
94+
var ndarray2array = require( '@stdlib/ndarray/to-array' );
9695
var maybeBroadcastArrays = require( '@stdlib/ndarray/base/maybe-broadcast-arrays' );
9796

9897
// Create a 2x2 array:
9998
var x = array( [ [ 1, 2 ], [ 3, 4 ] ] );
100-
// returns <ndarray>
99+
// returns <ndarray>[ [ 1, 2 ], [ 3, 4 ] ]
101100

102101
// Create a 3x2x2 array:
103102
var y = zeros( [ 3, 2, 2 ] );
104103
// returns <ndarray>
105104

106105
// Broadcast arrays to a common shape:
107106
var out = maybeBroadcastArrays( [ x, y ] );
108-
// returns <ndarray>
109-
110-
// Retrieve the common shape:
111-
var sh = out[ 0 ].shape;
112-
// returns [ 3, 2, 2 ]
113-
114-
// Retrieve the number of elements:
115-
var N = numel( sh );
107+
// returns [ <ndarray>, <ndarray> ]
116108

117-
// Loop through the array elements...
118-
var i;
119-
for ( i = 0; i < N; i++ ) {
120-
console.log( 'X[%s] = %d', ind2sub( sh, i ).join( ', ' ), out[ 0 ].iget( i ) );
121-
}
109+
console.log( ndarray2array( out[ 0 ] ) );
110+
// => [ [ [ 1, 2 ], [ 3, 4 ] ], [ [ 1, 2 ], [ 3, 4 ] ], [ [ 1, 2 ], [ 3, 4 ] ] ]
122111
```
123112

124113
</section>

base/maybe-broadcast-arrays/docs/repl.txt

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,37 +34,15 @@
3434
Examples
3535
--------
3636
> var x = {{alias:@stdlib/ndarray/array}}( [ [ 1, 2 ], [ 3, 4 ] ] )
37-
<ndarray>
38-
> var sh = x.shape
39-
[ 2, 2 ]
37+
<ndarray>[ [ 1, 2 ], [ 3, 4 ] ]
4038
> var y = {{alias:@stdlib/ndarray/zeros}}( [ 3, 2, 2 ] )
41-
<ndarray>
39+
<ndarray>[ [ [0,0], [0,0] ], [ [0,0], [0,0] ], [ [0,0], [0,0] ] ]
4240
> var out = {{alias}}( [ x, y ] )
4341
[ <ndarray>, <ndarray> ]
4442

4543
// Retrieve the broadcasted "x" array:
4644
> var bx = out[ 0 ]
47-
<ndarray>
48-
> sh = bx.shape
49-
[ 3, 2, 2 ]
50-
51-
// Retrieve broadcasted elements...
52-
> var v = bx.get( 0, 0, 0 )
53-
1
54-
> v = bx.get( 0, 0, 1 )
55-
2
56-
> v = bx.get( 0, 1, 0 )
57-
3
58-
> v = bx.get( 0, 1, 1 )
59-
4
60-
> v = bx.get( 1, 0, 0 )
61-
1
62-
> v = bx.get( 1, 1, 0 )
63-
3
64-
> v = bx.get( 2, 0, 0 )
65-
1
66-
> v = bx.get( 2, 1, 1 )
67-
4
45+
<ndarray>[ [ [1,2], [3,4] ], [ [1,2], [3,4] ], [ [1,2], [3,4] ] ]
6846

6947
See Also
7048
--------

base/maybe-broadcast-arrays/docs/types/index.d.ts

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38,53 +38,36 @@ import { ndarray } from '@stdlib/types/ndarray';
3838
* @returns list of broadcasted arrays
3939
*
4040
* @example
41+
* var getShape = require( '@stdlib/ndarray/shape' );
4142
* var array = require( '@stdlib/ndarray/array' );
4243
* var zeros = require( '@stdlib/ndarray/zeros' );
4344
*
44-
* var x = array( [ [ 1, 2 ], [ 3, 4 ] ] );
45-
* // returns <ndarray>
45+
* var x1 = array( [ [ 1, 2 ], [ 3, 4 ] ] );
46+
* // returns <ndarray>[ [ 1, 2 ], [ 3, 4 ] ]
4647
*
47-
* var shx = x.shape;
48+
* var shx = getShape( x1 );
4849
* // returns [ 2, 2 ]
4950
*
5051
* var y1 = zeros( [ 3, 2, 2 ] );
51-
* // returns <ndarray>
52+
* // returns <ndarray>[ [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ] ]
5253
*
53-
* var shy = y1.shape;
54+
* var shy = getShape( y1 );
5455
* // returns [ 3, 2, 2 ]
5556
*
56-
* var out = maybeBroadcastArrays( [ x, y1 ] );
57+
* var out = maybeBroadcastArrays( [ x1, y1 ] );
5758
* // returns [ <ndarray>, <ndarray> ]
5859
*
5960
* var x2 = out[ 0 ];
60-
* // returns <ndarray>
61+
* // returns <ndarray>[ [ [ 1, 2 ], [ 3, 4 ] ], [ [ 1, 2 ], [ 3, 4 ] ], [ [ 1, 2 ], [ 3, 4 ] ] ]
6162
*
6263
* var y2 = out[ 1 ];
63-
* // returns <ndarray>
64+
* // returns <ndarray>[ [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ] ]
6465
*
65-
* shx = x2.shape;
66+
* shx = getShape( x2 );
6667
* // returns [ 3, 2, 2 ]
6768
*
68-
* shy = y2.shape;
69+
* shy = getShape( y2 );
6970
* // returns [ 3, 2, 2 ]
70-
*
71-
* var v = x2.get( 0, 0, 0 );
72-
* // returns 1
73-
*
74-
* v = x2.get( 0, 0, 1 );
75-
* // returns 2
76-
*
77-
* v = x2.get( 1, 0, 0 );
78-
* // returns 1
79-
*
80-
* v = x2.get( 1, 1, 0 );
81-
* // returns 3
82-
*
83-
* v = x2.get( 2, 0, 0 );
84-
* // returns 1
85-
*
86-
* v = x2.get( 2, 1, 1 );
87-
* // returns 4
8871
*/
8972
declare function maybeBroadcastArrays( arrays: ArrayLike<ndarray> ): Array<ndarray>;
9073

base/maybe-broadcast-arrays/examples/index.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
var array = require( './../../../array' );
2222
var zeros = require( './../../../zeros' );
23-
var numel = require( './../../../base/numel' );
24-
var ind2sub = require( './../../../ind2sub' );
23+
var ndarray2array = require( './../../../to-array' );
2524
var maybeBroadcastArrays = require( './../lib' );
2625

2726
// Create a 2x2 array:
@@ -34,17 +33,6 @@ var y = zeros( [ 3, 2, 2 ] );
3433

3534
// Broadcast arrays to a common shape:
3635
var out = maybeBroadcastArrays( [ x, y ] );
37-
// returns <ndarray>
38-
39-
// Retrieve the common shape:
40-
var sh = out[ 0 ].shape;
41-
// returns [ 3, 2, 2 ]
42-
43-
// Retrieve the number of elements:
44-
var N = numel( sh );
36+
// returns [ <ndarray>, <ndarray> ]
4537

46-
// Loop through the array elements...
47-
var i;
48-
for ( i = 0; i < N; i++ ) {
49-
console.log( 'X[%s] = %d', ind2sub( sh, i ).join( ', ' ), out[ 0 ].iget( i ) );
50-
}
38+
console.log( ndarray2array( out[ 0 ] ) );

base/maybe-broadcast-arrays/lib/index.js

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,37 @@
2424
* @module @stdlib/ndarray/base/maybe-broadcast-arrays
2525
*
2626
* @example
27+
* var getShape = require( '@stdlib/ndarray/shape' );
2728
* var array = require( '@stdlib/ndarray/array' );
2829
* var zeros = require( '@stdlib/ndarray/zeros' );
2930
* var maybeBroadcastArrays = require( '@stdlib/ndarray/base/maybe-broadcast-arrays' );
3031
*
3132
* var x1 = array( [ [ 1, 2 ], [ 3, 4 ] ] );
32-
* // returns <ndarray>
33+
* // returns <ndarray>[ [ 1, 2 ], [ 3, 4 ] ]
3334
*
34-
* var shx = x1.shape;
35+
* var shx = getShape( x1 );
3536
* // returns [ 2, 2 ]
3637
*
3738
* var y1 = zeros( [ 3, 2, 2 ] );
38-
* // returns <ndarray>
39+
* // returns <ndarray>[ [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ] ]
3940
*
40-
* var shy = y1.shape;
41+
* var shy = getShape( y1 );
4142
* // returns [ 3, 2, 2 ]
4243
*
4344
* var out = maybeBroadcastArrays( [ x1, y1 ] );
4445
* // returns [ <ndarray>, <ndarray> ]
4546
*
4647
* var x2 = out[ 0 ];
47-
* // returns <ndarray>
48+
* // returns <ndarray>[ [ [ 1, 2 ], [ 3, 4 ] ], [ [ 1, 2 ], [ 3, 4 ] ], [ [ 1, 2 ], [ 3, 4 ] ] ]
4849
*
4950
* var y2 = out[ 1 ];
50-
* // returns <ndarray>
51+
* // returns <ndarray>[ [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ] ]
5152
*
52-
* shx = x2.shape;
53+
* shx = getShape( x2 );
5354
* // returns [ 3, 2, 2 ]
5455
*
55-
* shy = y2.shape;
56+
* shy = getShape( y2 );
5657
* // returns [ 3, 2, 2 ]
57-
*
58-
* var v = x2.get( 0, 0, 0 );
59-
* // returns 1
60-
*
61-
* v = x2.get( 0, 0, 1 );
62-
* // returns 2
63-
*
64-
* v = x2.get( 1, 0, 0 );
65-
* // returns 1
66-
*
67-
* v = x2.get( 1, 1, 0 );
68-
* // returns 3
69-
*
70-
* v = x2.get( 2, 0, 0 );
71-
* // returns 1
72-
*
73-
* v = x2.get( 2, 1, 1 );
74-
* // returns 4
7558
*/
7659

7760
// MODULES //

base/maybe-broadcast-arrays/lib/main.js

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,54 +40,37 @@ var getShape = require( './../../../base/shape' );
4040
* @returns {Array<ndarray>} broadcasted arrays
4141
*
4242
* @example
43+
* var getShape = require( '@stdlib/ndarray/shape' );
4344
* var array = require( '@stdlib/ndarray/array' );
4445
* var zeros = require( '@stdlib/ndarray/zeros' );
4546
*
4647
* var x1 = array( [ [ 1, 2 ], [ 3, 4 ] ] );
47-
* // returns <ndarray>
48+
* // returns <ndarray>[ [ 1, 2 ], [ 3, 4 ] ]
4849
*
49-
* var shx = x1.shape;
50+
* var shx = getShape( x1 );
5051
* // returns [ 2, 2 ]
5152
*
5253
* var y1 = zeros( [ 3, 2, 2 ] );
53-
* // returns <ndarray>
54+
* // returns <ndarray>[ [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ] ]
5455
*
55-
* var shy = y1.shape;
56+
* var shy = getShape( y1 );
5657
* // returns [ 3, 2, 2 ]
5758
*
5859
* var out = maybeBroadcastArrays( [ x1, y1 ] );
59-
* // returns <ndarray>
60+
* // returns [ <ndarray>, <ndarray> ]
6061
*
6162
* var x2 = out[ 0 ];
62-
* // returns <ndarray>
63+
* // returns <ndarray>[ [ [ 1, 2 ], [ 3, 4 ] ], [ [ 1, 2 ], [ 3, 4 ] ], [ [ 1, 2 ], [ 3, 4 ] ] ]
6364
*
6465
* var y2 = out[ 1 ];
65-
* // returns <ndarray>
66+
* // returns <ndarray>[ [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ], [ [ 0, 0 ], [ 0, 0 ] ] ]
6667
*
67-
* shx = x2.shape;
68+
* shx = getShape( x2 );
6869
* // returns [ 3, 2, 2 ]
6970
*
70-
* shy = y2.shape;
71+
* shy = getShape( y2 );
7172
* // returns [ 3, 2, 2 ]
7273
*
73-
* var v = x2.get( 0, 0, 0 );
74-
* // returns 1
75-
*
76-
* v = x2.get( 0, 0, 1 );
77-
* // returns 2
78-
*
79-
* v = x2.get( 1, 0, 0 );
80-
* // returns 1
81-
*
82-
* v = x2.get( 1, 1, 0 );
83-
* // returns 3
84-
*
85-
* v = x2.get( 2, 0, 0 );
86-
* // returns 1
87-
*
88-
* v = x2.get( 2, 1, 1 );
89-
* // returns 4
90-
*
9174
* @example
9275
* var zeros = require( '@stdlib/ndarray/zeros' );
9376
*

0 commit comments

Comments
 (0)