Skip to content

Commit e5bb851

Browse files
kgrytekgryte
committed
Refactor ndarray constructor usage
1 parent 1d59407 commit e5bb851

6 files changed

Lines changed: 84 additions & 114 deletions

File tree

‎lib/node_modules/@stdlib/blas/ddot/test/test.js‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,10 @@ var tape = require( 'tape' );
2424
var Float64Array = require( '@stdlib/array/float64' );
2525
var Float32Array = require( '@stdlib/array/float32' );
2626
var array = require( '@stdlib/ndarray/array' );
27-
var ctor = require( '@stdlib/ndarray/ctor' );
27+
var ndarray = require( '@stdlib/ndarray/ctor' );
2828
var ddot = require( './../lib' );
2929

3030

31-
// VARIABLES //
32-
33-
var ndarray = ctor( 'float64', 1 );
34-
35-
3631
// TESTS //
3732

3833
tape( 'main export is a function', function test( t ) {
@@ -170,8 +165,8 @@ tape( 'the function supports a strided vector for the first argument', function
170165
-3.0 // 2
171166
]);
172167

173-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
174-
y = ndarray( y, [ 3 ], [ 1 ], 0, 'row-major' );
168+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
169+
y = ndarray( 'float64', y, [ 3 ], [ 1 ], 0, 'row-major' );
175170

176171
dot = ddot( x, y );
177172
t.strictEqual( dot, -12.0, 'returns expected value' );
@@ -198,8 +193,8 @@ tape( 'the function supports a strided vector for the second argument', function
198193
1.0
199194
]);
200195

201-
x = ndarray( x, [ 3 ], [ 1 ], 0, 'row-major' );
202-
y = ndarray( y, [ 3 ], [ 2 ], 0, 'row-major' );
196+
x = ndarray( 'float64', x, [ 3 ], [ 1 ], 0, 'row-major' );
197+
y = ndarray( 'float64', y, [ 3 ], [ 2 ], 0, 'row-major' );
203198

204199
dot = ddot( x, y );
205200
t.strictEqual( dot, 45.0, 'returns expected value' );
@@ -225,8 +220,8 @@ tape( 'the function supports negative strides', function test( t ) {
225220
8.0 // 0
226221
]);
227222

228-
x = ndarray( x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
229-
y = ndarray( y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
223+
x = ndarray( 'float64', x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
224+
y = ndarray( 'float64', y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
230225

231226
dot = ddot( x, y );
232227
t.strictEqual( dot, 67.0, 'returns expected value' );
@@ -252,8 +247,8 @@ tape( 'the function supports complex access patterns', function test( t ) {
252247
8.0 // 0
253248
]);
254249

255-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
256-
y = ndarray( y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
250+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
251+
y = ndarray( 'float64', y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
257252

258253
dot = ddot( x, y );
259254
t.strictEqual( dot, 59.0, 'returns expected value' );
@@ -282,8 +277,8 @@ tape( 'the function supports strided vectors having offsets', function test( t )
282277
-3.0 // 2
283278
]);
284279

285-
x = ndarray( x, [ 3 ], [ 2 ], 1, 'row-major' );
286-
y = ndarray( y, [ 3 ], [ 1 ], 2, 'row-major' );
280+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 1, 'row-major' );
281+
y = ndarray( 'float64', y, [ 3 ], [ 1 ], 2, 'row-major' );
287282

288283
dot = ddot( x, y );
289284
t.strictEqual( dot, -12.0, 'returns expected value' );
@@ -318,8 +313,8 @@ tape( 'the function supports underlying data buffers with view offsets', functio
318313
x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 );
319314
y1 = new Float64Array( y0.buffer, y0.BYTES_PER_ELEMENT*3 );
320315

321-
x1 = ndarray( x1, [ 3 ], [ 2 ], 0, 'row-major' );
322-
y1 = ndarray( y1, [ 3 ], [ 1 ], 0, 'row-major' );
316+
x1 = ndarray( 'float64', x1, [ 3 ], [ 2 ], 0, 'row-major' );
317+
y1 = ndarray( 'float64', y1, [ 3 ], [ 1 ], 0, 'row-major' );
323318

324319
dot = ddot( x1, y1 );
325320
t.strictEqual( dot, 124.0, 'returns expected value' );

‎lib/node_modules/@stdlib/blas/dswap/test/test.js‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,11 @@ var tape = require( 'tape' );
2424
var Float64Array = require( '@stdlib/array/float64' );
2525
var Int16Array = require( '@stdlib/array/int16' );
2626
var array = require( '@stdlib/ndarray/array' );
27-
var ctor = require( '@stdlib/ndarray/ctor' );
27+
var ndarray = require( '@stdlib/ndarray/ctor' );
2828
var dcopy = require( '@stdlib/blas/base/dcopy' ).ndarray;
2929
var dswap = require( './../lib' );
3030

3131

32-
// VARIABLES //
33-
34-
var ndarray = ctor( 'float64', 1 );
35-
36-
3732
// TESTS //
3833

3934
tape( 'main export is a function', function test( t ) {
@@ -169,8 +164,8 @@ tape( 'the function supports a strided vector for the first argument', function
169164
xe = new Float64Array( [ 6.0, 2.0, 7.0, 4.0, 8.0 ] );
170165
ye = new Float64Array( [ 1.0, 3.0, 5.0 ] );
171166

172-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
173-
y = ndarray( y, [ 3 ], [ 1 ], 0, 'row-major' );
167+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
168+
y = ndarray( 'float64', y, [ 3 ], [ 1 ], 0, 'row-major' );
174169

175170
dswap( x, y );
176171

@@ -205,8 +200,8 @@ tape( 'the function supports a strided vector for the second argument', function
205200
xe = new Float64Array( [ 6.0, 8.0, 10.0 ] );
206201
ye = new Float64Array( [ 1.0, 7.0, 2.0, 9.0, 3.0 ] );
207202

208-
x = ndarray( x, [ 3 ], [ 1 ], 0, 'row-major' );
209-
y = ndarray( y, [ 3 ], [ 2 ], 0, 'row-major' );
203+
x = ndarray( 'float64', x, [ 3 ], [ 1 ], 0, 'row-major' );
204+
y = ndarray( 'float64', y, [ 3 ], [ 2 ], 0, 'row-major' );
210205

211206
dswap( x, y );
212207

@@ -241,8 +236,8 @@ tape( 'the function supports negative strides', function test( t ) {
241236
xe = new Float64Array( [ 6.0, 2.0, 7.0, 4.0, 8.0 ] );
242237
ye = new Float64Array( [ 1.0, 3.0, 5.0 ] );
243238

244-
x = ndarray( x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
245-
y = ndarray( y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
239+
x = ndarray( 'float64', x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
240+
y = ndarray( 'float64', y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
246241

247242
dswap( x, y );
248243

@@ -278,8 +273,8 @@ tape( 'the function supports complex access patterns', function test( t ) {
278273
xe = new Float64Array( [ 9.0, 2.0, 8.0, 4.0, 7.0, 6.0 ] );
279274
ye = new Float64Array( [ 5.0, 3.0, 1.0 ] );
280275

281-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
282-
y = ndarray( y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
276+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
277+
y = ndarray( 'float64', y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
283278

284279
dswap( x, y );
285280

@@ -318,8 +313,8 @@ tape( 'the function supports strided vectors having offsets', function test( t )
318313
xe = new Float64Array( [ 1.0, 12.0, 3.0, 11.0, 5.0, 10.0 ] );
319314
ye = new Float64Array( [ 7.0, 8.0, 9.0, 6.0, 4.0, 2.0 ] );
320315

321-
x = ndarray( x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
322-
y = ndarray( y, [ 3 ], [ 1 ], 3, 'row-major' );
316+
x = ndarray( 'float64', x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
317+
y = ndarray( 'float64', y, [ 3 ], [ 1 ], 3, 'row-major' );
323318

324319
dswap( x, y );
325320

@@ -363,8 +358,8 @@ tape( 'the function supports underlying data buffers with view offsets', functio
363358
xe = new Float64Array( [ 1.0, 10.0, 3.0, 11.0, 5.0, 12.0 ] );
364359
ye = new Float64Array( [ 7.0, 8.0, 9.0, 2.0, 4.0, 6.0 ] );
365360

366-
x1 = ndarray( x1, [ 3 ], [ 2 ], 0, 'row-major' );
367-
y1 = ndarray( y1, [ 3 ], [ 1 ], 0, 'row-major' );
361+
x1 = ndarray( 'float64', x1, [ 3 ], [ 2 ], 0, 'row-major' );
362+
y1 = ndarray( 'float64', y1, [ 3 ], [ 1 ], 0, 'row-major' );
368363

369364
dswap( x1, y1 );
370365

‎lib/node_modules/@stdlib/blas/gdot/test/test.js‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,10 @@ var Float32Array = require( '@stdlib/array/float32' );
2626
var Int32Array = require( '@stdlib/array/int32' );
2727
var Int8Array = require( '@stdlib/array/int8' );
2828
var array = require( '@stdlib/ndarray/array' );
29-
var ctor = require( '@stdlib/ndarray/ctor' );
29+
var ndarray = require( '@stdlib/ndarray/ctor' );
3030
var gdot = require( './../lib' );
3131

3232

33-
// VARIABLES //
34-
35-
var ndarray = ctor( 'float64', 1 );
36-
37-
3833
// TESTS //
3934

4035
tape( 'main export is a function', function test( t ) {
@@ -293,8 +288,8 @@ tape( 'the function supports a strided vector for the first argument (ndarrays)'
293288
-3.0 // 2
294289
]);
295290

296-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
297-
y = ndarray( y, [ 3 ], [ 1 ], 0, 'row-major' );
291+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
292+
y = ndarray( 'float64', y, [ 3 ], [ 1 ], 0, 'row-major' );
298293

299294
dot = gdot( x, y );
300295
t.strictEqual( dot, -12.0, 'returns expected value' );
@@ -320,7 +315,7 @@ tape( 'the function supports a strided vector for the first argument (mixed)', f
320315
-3.0 // 2
321316
]);
322317

323-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
318+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
324319

325320
dot = gdot( x, y );
326321
t.strictEqual( dot, -12.0, 'returns expected value' );
@@ -347,8 +342,8 @@ tape( 'the function supports a strided vector for the second argument (ndarrays)
347342
1.0
348343
]);
349344

350-
x = ndarray( x, [ 3 ], [ 1 ], 0, 'row-major' );
351-
y = ndarray( y, [ 3 ], [ 2 ], 0, 'row-major' );
345+
x = ndarray( 'float64', x, [ 3 ], [ 1 ], 0, 'row-major' );
346+
y = ndarray( 'float64', y, [ 3 ], [ 2 ], 0, 'row-major' );
352347

353348
dot = gdot( x, y );
354349
t.strictEqual( dot, 45.0, 'returns expected value' );
@@ -375,7 +370,7 @@ tape( 'the function supports a strided vector for the second argument (mixed)',
375370
1.0
376371
]);
377372

378-
y = ndarray( y, [ 3 ], [ 2 ], 0, 'row-major' );
373+
y = ndarray( 'float64', y, [ 3 ], [ 2 ], 0, 'row-major' );
379374

380375
dot = gdot( x, y );
381376
t.strictEqual( dot, 45.0, 'returns expected value' );
@@ -401,8 +396,8 @@ tape( 'the function supports negative strides (ndarrays)', function test( t ) {
401396
8.0 // 0
402397
]);
403398

404-
x = ndarray( x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
405-
y = ndarray( y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
399+
x = ndarray( 'float64', x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
400+
y = ndarray( 'float64', y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
406401

407402
dot = gdot( x, y );
408403
t.strictEqual( dot, 67.0, 'returns expected value' );
@@ -428,8 +423,8 @@ tape( 'the function supports complex access patterns (ndarrays)', function test(
428423
8.0 // 0
429424
]);
430425

431-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
432-
y = ndarray( y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
426+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
427+
y = ndarray( 'float64', y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
433428

434429
dot = gdot( x, y );
435430
t.strictEqual( dot, 59.0, 'returns expected value' );
@@ -458,8 +453,8 @@ tape( 'the function supports strided vectors having offsets (ndarrays)', functio
458453
-3.0 // 2
459454
]);
460455

461-
x = ndarray( x, [ 3 ], [ 2 ], 1, 'row-major' );
462-
y = ndarray( y, [ 3 ], [ 1 ], 2, 'row-major' );
456+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 1, 'row-major' );
457+
y = ndarray( 'float64', y, [ 3 ], [ 1 ], 2, 'row-major' );
463458

464459
dot = gdot( x, y );
465460
t.strictEqual( dot, -12.0, 'returns expected value' );
@@ -494,8 +489,8 @@ tape( 'the function supports underlying data buffers with view offsets (ndarrays
494489
x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 );
495490
y1 = new Float64Array( y0.buffer, y0.BYTES_PER_ELEMENT*3 );
496491

497-
x1 = ndarray( x1, [ 3 ], [ 2 ], 0, 'row-major' );
498-
y1 = ndarray( y1, [ 3 ], [ 1 ], 0, 'row-major' );
492+
x1 = ndarray( 'float64', x1, [ 3 ], [ 2 ], 0, 'row-major' );
493+
y1 = ndarray( 'float64', y1, [ 3 ], [ 1 ], 0, 'row-major' );
499494

500495
dot = gdot( x1, y1 );
501496
t.strictEqual( dot, 124.0, 'returns expected value' );
@@ -530,7 +525,7 @@ tape( 'the function supports underlying data buffers with view offsets (mixed)',
530525
x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 );
531526
y1 = new Float64Array( y0.buffer, y0.BYTES_PER_ELEMENT*3 );
532527

533-
x1 = ndarray( x1, [ 3 ], [ 2 ], 0, 'row-major' );
528+
x1 = ndarray( 'float64', x1, [ 3 ], [ 2 ], 0, 'row-major' );
534529

535530
dot = gdot( x1, y1 );
536531
t.strictEqual( dot, 124.0, 'returns expected value' );

‎lib/node_modules/@stdlib/blas/gswap/test/test.js‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,11 @@ var Float32Array = require( '@stdlib/array/float32' );
2626
var Int32Array = require( '@stdlib/array/int32' );
2727
var Int8Array = require( '@stdlib/array/int8' );
2828
var array = require( '@stdlib/ndarray/array' );
29-
var ctor = require( '@stdlib/ndarray/ctor' );
29+
var ndarray = require( '@stdlib/ndarray/ctor' );
3030
var gcopy = require( '@stdlib/blas/base/gcopy' ).ndarray;
3131
var gswap = require( './../lib' );
3232

3333

34-
// VARIABLES //
35-
36-
var ndarray = ctor( 'float64', 1 );
37-
38-
3934
// TESTS //
4035

4136
tape( 'main export is a function', function test( t ) {
@@ -351,8 +346,8 @@ tape( 'the function supports a strided vector for the first argument (ndarrays)'
351346
xe = new Float64Array( [ 6.0, 2.0, 7.0, 4.0, 8.0 ] );
352347
ye = new Float64Array( [ 1.0, 3.0, 5.0 ] );
353348

354-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
355-
y = ndarray( y, [ 3 ], [ 1 ], 0, 'row-major' );
349+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
350+
y = ndarray( 'float64', y, [ 3 ], [ 1 ], 0, 'row-major' );
356351

357352
gswap( x, y );
358353

@@ -387,7 +382,7 @@ tape( 'the function supports a strided vector for the first argument (mixed)', f
387382
xe = new Float64Array( [ 6.0, 2.0, 7.0, 4.0, 8.0 ] );
388383
ye = new Float64Array( [ 1.0, 3.0, 5.0 ] );
389384

390-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
385+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
391386

392387
gswap( x, y );
393388

@@ -422,8 +417,8 @@ tape( 'the function supports a strided vector for the second argument (ndarrays)
422417
xe = new Float64Array( [ 6.0, 8.0, 10.0 ] );
423418
ye = new Float64Array( [ 1.0, 7.0, 2.0, 9.0, 3.0 ] );
424419

425-
x = ndarray( x, [ 3 ], [ 1 ], 0, 'row-major' );
426-
y = ndarray( y, [ 3 ], [ 2 ], 0, 'row-major' );
420+
x = ndarray( 'float64', x, [ 3 ], [ 1 ], 0, 'row-major' );
421+
y = ndarray( 'float64', y, [ 3 ], [ 2 ], 0, 'row-major' );
427422

428423
gswap( x, y );
429424

@@ -458,7 +453,7 @@ tape( 'the function supports a strided vector for the second argument (mixed)',
458453
xe = new Float64Array( [ 6.0, 8.0, 10.0 ] );
459454
ye = new Float64Array( [ 1.0, 7.0, 2.0, 9.0, 3.0 ] );
460455

461-
y = ndarray( y, [ 3 ], [ 2 ], 0, 'row-major' );
456+
y = ndarray( 'float64', y, [ 3 ], [ 2 ], 0, 'row-major' );
462457

463458
gswap( x, y );
464459

@@ -493,8 +488,8 @@ tape( 'the function supports negative strides (ndarrays)', function test( t ) {
493488
xe = new Float64Array( [ 6.0, 2.0, 7.0, 4.0, 8.0 ] );
494489
ye = new Float64Array( [ 1.0, 3.0, 5.0 ] );
495490

496-
x = ndarray( x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
497-
y = ndarray( y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
491+
x = ndarray( 'float64', x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
492+
y = ndarray( 'float64', y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
498493

499494
gswap( x, y );
500495

@@ -530,8 +525,8 @@ tape( 'the function supports complex access patterns (ndarrays)', function test(
530525
xe = new Float64Array( [ 9.0, 2.0, 8.0, 4.0, 7.0, 6.0 ] );
531526
ye = new Float64Array( [ 5.0, 3.0, 1.0 ] );
532527

533-
x = ndarray( x, [ 3 ], [ 2 ], 0, 'row-major' );
534-
y = ndarray( y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
528+
x = ndarray( 'float64', x, [ 3 ], [ 2 ], 0, 'row-major' );
529+
y = ndarray( 'float64', y, [ 3 ], [ -1 ], y.length-1, 'row-major' );
535530

536531
gswap( x, y );
537532

@@ -570,8 +565,8 @@ tape( 'the function supports strided vectors having offsets (ndarrays)', functio
570565
xe = new Float64Array( [ 1.0, 12.0, 3.0, 11.0, 5.0, 10.0 ] );
571566
ye = new Float64Array( [ 7.0, 8.0, 9.0, 6.0, 4.0, 2.0 ] );
572567

573-
x = ndarray( x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
574-
y = ndarray( y, [ 3 ], [ 1 ], 3, 'row-major' );
568+
x = ndarray( 'float64', x, [ 3 ], [ -2 ], x.length-1, 'row-major' );
569+
y = ndarray( 'float64', y, [ 3 ], [ 1 ], 3, 'row-major' );
575570

576571
gswap( x, y );
577572

@@ -615,8 +610,8 @@ tape( 'the function supports underlying data buffers with view offsets (ndarrays
615610
xe = new Float64Array( [ 1.0, 10.0, 3.0, 11.0, 5.0, 12.0 ] );
616611
ye = new Float64Array( [ 7.0, 8.0, 9.0, 2.0, 4.0, 6.0 ] );
617612

618-
x1 = ndarray( x1, [ 3 ], [ 2 ], 0, 'row-major' );
619-
y1 = ndarray( y1, [ 3 ], [ 1 ], 0, 'row-major' );
613+
x1 = ndarray( 'float64', x1, [ 3 ], [ 2 ], 0, 'row-major' );
614+
y1 = ndarray( 'float64', y1, [ 3 ], [ 1 ], 0, 'row-major' );
620615

621616
gswap( x1, y1 );
622617

@@ -660,7 +655,7 @@ tape( 'the function supports underlying data buffers with view offsets (mixed)',
660655
xe = new Float64Array( [ 1.0, 10.0, 3.0, 11.0, 5.0, 12.0 ] );
661656
ye = new Float64Array( [ 7.0, 8.0, 9.0, 2.0, 4.0, 6.0 ] );
662657

663-
x1 = ndarray( x1, [ 3 ], [ 2 ], 0, 'row-major' );
658+
x1 = ndarray( 'float64', x1, [ 3 ], [ 2 ], 0, 'row-major' );
664659

665660
gswap( x1, y1 );
666661

0 commit comments

Comments
 (0)