Skip to content

Commit b2f66e9

Browse files
authored
fix: ensure correct order is returned and fix heading
PR-URL: #12217 Reviewed-by: Athan Reines <kgryte@gmail.com>
1 parent 24639c3 commit b2f66e9

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

lib/node_modules/@stdlib/ndarray/base/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ var o = ns;
140140
- <span class="signature">[`minmaxViewBufferIndex( shape, strides, offset )`][@stdlib/ndarray/base/minmax-view-buffer-index]</span><span class="delimiter">: </span><span class="description">compute the minimum and maximum linear indices in an underlying data buffer which are accessible to an array view.</span>
141141
- <span class="signature">[`nansLike( x )`][@stdlib/ndarray/base/nans-like]</span><span class="delimiter">: </span><span class="description">create a NaN-filled ndarray having the same shape and data type as a provided ndarray.</span>
142142
- <span class="signature">[`nans( dtype, shape, order )`][@stdlib/ndarray/base/nans]</span><span class="delimiter">: </span><span class="description">create a NaN-filled ndarray having a specified shape and data type.</span>
143-
- <span class="signature">[`ndarraylike2descriptor( dtype, buffer, shape, strides, offset, order )`][@stdlib/ndarray/base/ndarraylike2descriptor]</span><span class="delimiter">: </span><span class="description">convert an ndarray-like object to an ndarray descriptor.</span>
143+
- <span class="signature">[`ndarraylike2descriptor( x )`][@stdlib/ndarray/base/ndarraylike2descriptor]</span><span class="delimiter">: </span><span class="description">convert an ndarray-like object to an ndarray descriptor.</span>
144144
- <span class="signature">[`ndarraylike2ndarray( x )`][@stdlib/ndarray/base/ndarraylike2ndarray]</span><span class="delimiter">: </span><span class="description">convert an ndarray-like object to an `ndarray`.</span>
145145
- <span class="signature">[`ndarraylike2object( x )`][@stdlib/ndarray/base/ndarraylike2object]</span><span class="delimiter">: </span><span class="description">convert an `ndarray`-like object to an object likely to have the same "shape".</span>
146146
- <span class="signature">[`ndarraylike2scalar( x )`][@stdlib/ndarray/base/ndarraylike2scalar]</span><span class="delimiter">: </span><span class="description">convert an ndarray-like object to a scalar value.</span>

lib/node_modules/@stdlib/ndarray/base/ndarraylike2descriptor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ limitations under the License.
4040
var ndarraylike2descriptor = require( '@stdlib/ndarray/base/ndarraylike2descriptor' );
4141
```
4242

43-
#### ndarraylike2descriptor( dtype, buffer, shape, strides, offset, order )
43+
#### ndarraylike2descriptor( x )
4444

4545
Converts an ndarray-like object to an ndarray [descriptor][@stdlib/ndarray/base/descriptor].
4646

lib/node_modules/@stdlib/ndarray/base/order/lib/main.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,15 @@ function order( x ) {
6464
return ROW_MAJOR; // WARNING: default to row-major for ndarray-like objects lacking strides. This may or may not be accurate, and we're defaulting to row-major here based on the belief that row-major is more likely given that, e.g., JavaScript arrays are similar to C arrays (i.e., stored in row-major order).
6565
}
6666
o = strides2order( st );
67-
if ( o === 1 || o === 3 ) {
68-
return DEFAULT_ORDER; // for o == 3 (both row- and column-major; e.g., one-dimensional ndarrays), default to the default order
67+
if ( o === 1 ) {
68+
return ROW_MAJOR;
6969
}
7070
if ( o === 2 ) {
7171
return COLUMN_MAJOR;
7272
}
73+
if ( o === 3 ) {
74+
return DEFAULT_ORDER; // both row- and column-major (e.g., one-dimensional ndarrays); default to the default order
75+
}
7376
// o === 0
7477
if ( x.shape.length === 0 ) {
7578
return DEFAULT_ORDER; // default to the default order for zero-dimensional ndarrays

0 commit comments

Comments
 (0)