Skip to content

Commit 42522b7

Browse files
committed
Refactor ndarray constructor usage
1 parent 22e6add commit 42522b7

File tree

8 files changed

+24
-52
lines changed

8 files changed

+24
-52
lines changed

lib/node_modules/@stdlib/assert/is-centrosymmetric-matrix/README.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@ Tests if a value is a [centrosymmetric matrix][centrosymmetric-matrix].
3737
<!-- eslint-disable array-element-newline -->
3838

3939
```javascript
40-
var ctor = require( '@stdlib/ndarray/ctor' );
40+
var ndarray = require( '@stdlib/ndarray/ctor' );
4141

42-
var ndarray = ctor( 'generic', 2 );
4342
var buffer = [
4443
1, 2, 3,
4544
4, 5, 4,
4645
3, 2, 1
4746
];
48-
var arr = ndarray( buffer, [ 3, 3 ], [ 3, 1 ], 0, 'row-major' );
47+
var arr = ndarray( 'generic', buffer, [ 3, 3 ], [ 3, 1 ], 0, 'row-major' );
4948

5049
var bool = isCentrosymmetricMatrix( arr );
5150
// returns true
@@ -62,11 +61,10 @@ var bool = isCentrosymmetricMatrix( arr );
6261
<!-- eslint no-undef: "error" -->
6362

6463
```javascript
65-
var ctor = require( '@stdlib/ndarray/ctor' );
64+
var ndarray = require( '@stdlib/ndarray/ctor' );
6665
var isCentrosymmetricMatrix = require( '@stdlib/assert/is-centrosymmetric-matrix' );
6766

68-
var ndarray = ctor( 'generic', 2 );
69-
var arr = ndarray( [ 2, 1, 1, 2 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
67+
var arr = ndarray( 'generic', [ 2, 1, 1, 2 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
7068

7169
var out = isCentrosymmetricMatrix( arr );
7270
// returns true

lib/node_modules/@stdlib/assert/is-centrosymmetric-matrix/benchmark/benchmark.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222

2323
var bench = require( '@stdlib/bench' );
2424
var isBoolean = require( '@stdlib/assert/is-boolean' ).isPrimitive;
25-
var ctor = require( '@stdlib/ndarray/ctor' );
25+
var ndarray = require( '@stdlib/ndarray/ctor' );
2626
var pkg = require( './../package.json' ).name;
2727
var isCentrosymmetricMatrix = require( './../lib' );
2828

2929

3030
// MAIN //
3131

3232
bench( pkg, function benchmark( b ) {
33-
var ndarray;
3433
var strides;
3534
var offset;
3635
var buffer;
@@ -41,14 +40,13 @@ bench( pkg, function benchmark( b ) {
4140
var arr;
4241
var i;
4342

44-
ndarray = ctor( 'generic', 2 );
4543
buffer = [ 0, 0, 0, 0 ];
4644
shape = [ 2, 2 ];
4745
strides = [ 2, 1 ];
4846
offset = 0;
4947
order = 'row-major';
5048

51-
arr = ndarray( buffer, shape, strides, offset, order );
49+
arr = ndarray( 'generic', buffer, shape, strides, offset, order );
5250

5351
values = [
5452
arr,

lib/node_modules/@stdlib/assert/is-centrosymmetric-matrix/benchmark/benchmark.size.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var isBoolean = require( '@stdlib/assert/is-boolean' ).isPrimitive;
2525
var pow = require( '@stdlib/math/base/special/pow' );
2626
var sqrt = require( '@stdlib/math/base/special/sqrt' );
2727
var floor = require( '@stdlib/math/base/special/floor' );
28-
var ctor = require( '@stdlib/ndarray/ctor' );
28+
var ndarray = require( '@stdlib/ndarray/ctor' );
2929
var Float64Array = require( '@stdlib/array/float64' );
3030
var isOdd = require( '@stdlib/math/base/assert/is-odd' );
3131
var pkg = require( './../package.json' ).name;
@@ -45,16 +45,14 @@ var isCentrosymmetricMatrix = require( './../lib' );
4545
*/
4646
function createBenchmark( fcn, size, N ) {
4747
var strides;
48-
var matrix;
4948
var buffer;
5049
var shape;
5150
var x;
5251

53-
matrix = ctor( 'float64', 2 );
5452
buffer = new Float64Array( size );
5553
shape = [ N, N ];
5654
strides = [ N, 1 ];
57-
x = matrix( buffer, shape, strides, 0, 'row-major' );
55+
x = ndarray( 'float64', buffer, shape, strides, 0, 'row-major' );
5856

5957
return benchmark;
6058

lib/node_modules/@stdlib/assert/is-centrosymmetric-matrix/docs/repl.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
Examples
1616
--------
17-
> var mat = {{alias:@stdlib/ndarray/ctor}}( 'generic', 2 );
18-
> var M = mat( [ 2, 1, 1, 2 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
17+
> var buf = [ 2, 1, 1, 2 ];
18+
> var M = {{alias:@stdlib/ndarray/ctor}}( 'generic', buf, [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
1919
> var bool = {{alias}}( M )
2020
true
2121
> bool = {{alias}}( [ 1, 2, 3, 4 ] )

lib/node_modules/@stdlib/assert/is-centrosymmetric-matrix/examples/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818

1919
'use strict';
2020

21-
var ctor = require( '@stdlib/ndarray/ctor' );
21+
var ndarray = require( '@stdlib/ndarray/ctor' );
2222
var isCentrosymmetricMatrix = require( './../lib' );
2323

24-
var ndarray = ctor( 'generic', 2 );
25-
var arr = ndarray( [ 2, 1, 1, 2 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
24+
var arr = ndarray( 'generic', [ 2, 1, 1, 2 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
2625

2726
console.log( isCentrosymmetricMatrix( arr ) );
2827
// => true

lib/node_modules/@stdlib/assert/is-centrosymmetric-matrix/lib/index.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424
* @module @stdlib/assert/is-centrosymmetric-matrix
2525
*
2626
* @example
27-
* var ctor = require( '@stdlib/ndarray/ctor' );
27+
* var ndarray = require( '@stdlib/ndarray/ctor' );
2828
* var isCentrosymmetricMatrix = require( '@stdlib/assert/is-centrosymmetric-matrix' );
2929
*
30-
* var ndarray = ctor( 'generic', 2 );
31-
*
32-
* var arr = ndarray( [ 2, 1, 1, 2 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
30+
* var arr = ndarray( 'generic', [ 2, 1, 1, 2 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
3331
*
3432
* var bool = isCentrosymmetricMatrix( arr );
3533
* // returns true

lib/node_modules/@stdlib/assert/is-centrosymmetric-matrix/lib/main.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ var isOdd = require( '@stdlib/math/base/assert/is-odd' );
3939
* @returns {boolean} boolean indicating if a value is a centrosymmetric matrix
4040
*
4141
* @example
42-
* var ctor = require( '@stdlib/ndarray/ctor' );
42+
* var ndarray = require( '@stdlib/ndarray/ctor' );
4343
*
44-
* var ndarray = ctor( 'generic', 2 );
45-
* var arr = ndarray( [ 2, 1, 1, 2 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
44+
* var arr = ndarray( 'generic', [ 2, 1, 1, 2 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
4645
*
4746
* var bool = isCentrosymmetricMatrix( arr );
4847
* // returns true

lib/node_modules/@stdlib/assert/is-centrosymmetric-matrix/test/test.js

+8-26
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// MODULES //
2424

2525
var tape = require( 'tape' );
26-
var ctor = require( '@stdlib/ndarray/ctor' );
26+
var ndarray = require( '@stdlib/ndarray/ctor' );
2727
var noop = require( '@stdlib/utils/noop' );
2828
var isCentrosymmetricMatrix = require( './../lib' );
2929

@@ -37,30 +37,26 @@ tape( 'main export is a function', function test( t ) {
3737
});
3838

3939
tape( 'the function returns `true` if provided a centrosymmetric matrix (odd order)', function test( t ) {
40-
var ndarray;
4140
var buffer;
4241
var arr;
4342

44-
ndarray = ctor( 'generic', 2 );
4543
buffer = [
4644
0, 1, 2, 3, 4,
4745
5, 6, 7, 8, 9,
4846
10, 11, 12, 11, 10,
4947
9, 8, 7, 6, 5,
5048
4, 3, 2, 1, 0
5149
];
52-
arr = ndarray( buffer, [ 5, 5 ], [ 5, 1 ], 0, 'row-major' );
50+
arr = ndarray( 'generic', buffer, [ 5, 5 ], [ 5, 1 ], 0, 'row-major' );
5351

5452
t.equal( isCentrosymmetricMatrix( arr ), true, 'returns true' );
5553
t.end();
5654
});
5755

5856
tape( 'the function returns `true` if provided a centrosymmetric matrix (even order)', function test( t ) {
59-
var ndarray;
6057
var buffer;
6158
var arr;
6259

63-
ndarray = ctor( 'generic', 2 );
6460
buffer = [
6561
0, 1, 2, 3, 4, 5,
6662
6, 7, 8, 9, 10, 11,
@@ -69,16 +65,14 @@ tape( 'the function returns `true` if provided a centrosymmetric matrix (even or
6965
11, 10, 9, 8, 7, 6,
7066
5, 4, 3, 2, 1, 0
7167
];
72-
arr = ndarray( buffer, [ 6, 6 ], [ 6, 1 ], 0, 'row-major' );
68+
arr = ndarray( 'generic', buffer, [ 6, 6 ], [ 6, 1 ], 0, 'row-major' );
7369

7470
t.equal( isCentrosymmetricMatrix( arr ), true, 'returns true' );
7571
t.end();
7672
});
7773

7874
tape( 'the function returns `true` if provided a 2-dimensional ndarray-like object which is centrosymmetric', function test( t ) {
79-
var arr;
80-
81-
arr = {
75+
var arr = {
8276
'data': [
8377
0, 1, 2,
8478
3, 4, 3,
@@ -105,39 +99,29 @@ tape( 'the function returns `true` if provided a 2-dimensional ndarray-like obje
10599
});
106100

107101
tape( 'the function returns `false` if not provided a square matrix', function test( t ) {
108-
var ndarray;
109-
var arr;
110-
111-
ndarray = ctor( 'generic', 2 );
112-
arr = ndarray( [ 0, 0, 0, 0, 0, 0 ], [ 3, 2 ], [ 2, 1 ], 0, 'row-major' );
102+
var arr = ndarray( 'generic', [ 0, 0, 0, 0, 0, 0 ], [ 3, 2 ], [ 2, 1 ], 0, 'row-major' );
113103

114104
t.equal( isCentrosymmetricMatrix( arr ), false, 'returns false' );
115105
t.end();
116106
});
117107

118108
tape( 'the function returns `false` if not provided a centrosymmetric matrix (even order)', function test( t ) {
119-
var ndarray;
120-
var arr;
121-
122-
ndarray = ctor( 'generic', 2 );
123-
arr = ndarray( [ 1, 2, 3, 4 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
109+
var arr = ndarray( 'generic', [ 1, 2, 3, 4 ], [ 2, 2 ], [ 2, 1 ], 0, 'row-major' );
124110

125111
t.equal( isCentrosymmetricMatrix( arr ), false, 'returns false' );
126112
t.end();
127113
});
128114

129115
tape( 'the function returns `false` if not provided a centrosymmetric matrix (odd order)', function test( t ) {
130-
var ndarray;
131116
var buffer;
132117
var arr;
133118

134-
ndarray = ctor( 'generic', 2 );
135119
buffer = [
136120
1, 2, 3,
137121
4, 5, 6,
138122
3, 2, 1
139123
];
140-
arr = ndarray( buffer, [ 3, 3 ], [ 3, 1 ], 0, 'row-major' );
124+
arr = ndarray( 'generic', buffer, [ 3, 3 ], [ 3, 1 ], 0, 'row-major' );
141125

142126
t.equal( isCentrosymmetricMatrix( arr ), false, 'returns false' );
143127
t.end();
@@ -190,13 +174,11 @@ tape( 'the function returns `false` if provided a 2-dimensional ndarray-like obj
190174
});
191175

192176
tape( 'the function returns `false` if not provided a 2-dimensional ndarray-like object', function test( t ) {
193-
var ndarray;
194177
var values;
195178
var arr;
196179
var i;
197180

198-
ndarray = ctor( 'generic', 3 );
199-
arr = ndarray( [ 0, 0, 0 ], [ 3, 1, 1 ], [ 1, 1, 1 ], 0, 'row-major' );
181+
arr = ndarray( 'generic', [ 0, 0, 0 ], [ 3, 1, 1 ], [ 1, 1, 1 ], 0, 'row-major' );
200182

201183
values = [
202184
arr,

0 commit comments

Comments
 (0)