Skip to content

Commit 182903e

Browse files
committed
bench: refactor to use string interpolation in ndarray-base-find
1 parent 63f5705 commit 182903e

23 files changed

+88
-86
lines changed

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.10d_columnmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2828
var floor = require( '@stdlib/math/base/special/floor' );
2929
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
3030
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var find = require( './../lib/10d.js' );
3334

@@ -129,17 +130,16 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1 );
132-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
133+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1 );
136-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
137-
137+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
138138
len = floor( pow( len, 1.0/10.0 ) );
139139
sh = [ len, len, len, len, len, len, len, len, len, len ];
140140
len *= pow( len, 9 );
141141
f = createBenchmark( len, sh, t1 );
142-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
142+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
143143
}
144144
}
145145
}

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.10d_rowmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2828
var floor = require( '@stdlib/math/base/special/floor' );
2929
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
3030
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var find = require( './../lib/10d.js' );
3334

@@ -129,17 +130,16 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1 );
132-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
133+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1 );
136-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
137-
137+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
138138
len = floor( pow( len, 1.0/10.0 ) );
139139
sh = [ len, len, len, len, len, len, len, len, len, len ];
140140
len *= pow( len, 9 );
141141
f = createBenchmark( len, sh, t1 );
142-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
142+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
143143
}
144144
}
145145
}

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.11d_columnmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2828
var floor = require( '@stdlib/math/base/special/floor' );
2929
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
3030
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var find = require( './../lib/nd.js' );
3334

@@ -129,17 +130,16 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1 );
132-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
133+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1 );
136-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
137-
137+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
138138
len = floor( pow( len, 1.0/11.0 ) );
139139
sh = [ len, len, len, len, len, len, len, len, len, len, len ];
140140
len *= pow( len, 10 );
141141
f = createBenchmark( len, sh, t1 );
142-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
142+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
143143
}
144144
}
145145
}

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.11d_rowmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2828
var floor = require( '@stdlib/math/base/special/floor' );
2929
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
3030
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var find = require( './../lib/nd.js' );
3334

@@ -129,17 +130,16 @@ function main() {
129130

130131
sh = [ len/2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1 ];
131132
f = createBenchmark( len, sh, t1 );
132-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
133+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
133134

134135
sh = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, len/2 ];
135136
f = createBenchmark( len, sh, t1 );
136-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
137-
137+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
138138
len = floor( pow( len, 1.0/11.0 ) );
139139
sh = [ len, len, len, len, len, len, len, len, len, len, len ];
140140
len *= pow( len, 10 );
141141
f = createBenchmark( len, sh, t1 );
142-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
142+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
143143
}
144144
}
145145
}

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.1d_columnmajor.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2828
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
2929
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
3030
var filledarray = require( '@stdlib/array/filled' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var find = require( './../lib' );
3334

@@ -138,7 +139,7 @@ function main() {
138139

139140
sh = [ len ];
140141
f = createBenchmark( len, sh, t1 );
141-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
142+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
142143
}
143144
}
144145
}

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.1d_rowmajor.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var pow = require( '@stdlib/math/base/special/pow' );
2828
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
2929
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
3030
var filledarray = require( '@stdlib/array/filled' );
31+
var format = require( '@stdlib/string/format' );
3132
var pkg = require( './../package.json' ).name;
3233
var find = require( './../lib' );
3334

@@ -138,7 +139,7 @@ function main() {
138139

139140
sh = [ len ];
140141
f = createBenchmark( len, sh, t1 );
141-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
142+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
142143
}
143144
}
144145
}

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.2d_columnmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var sqrt = require( '@stdlib/math/base/special/sqrt' );
2929
var floor = require( '@stdlib/math/base/special/floor' );
3030
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
3131
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
32+
var format = require( '@stdlib/string/format' );
3233
var pkg = require( './../package.json' ).name;
3334
var find = require( './../lib/2d.js' );
3435

@@ -130,17 +131,16 @@ function main() {
130131

131132
sh = [ len/2, 2 ];
132133
f = createBenchmark( len, sh, t1 );
133-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
134+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
134135

135136
sh = [ 2, len/2 ];
136137
f = createBenchmark( len, sh, t1 );
137-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
138-
138+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
139139
len = floor( sqrt( len ) );
140140
sh = [ len, len ];
141141
len *= len;
142142
f = createBenchmark( len, sh, t1 );
143-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
143+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
144144
}
145145
}
146146
}

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.2d_rowmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var sqrt = require( '@stdlib/math/base/special/sqrt' );
2929
var floor = require( '@stdlib/math/base/special/floor' );
3030
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
3131
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
32+
var format = require( '@stdlib/string/format' );
3233
var pkg = require( './../package.json' ).name;
3334
var find = require( './../lib/2d.js' );
3435

@@ -130,17 +131,16 @@ function main() {
130131

131132
sh = [ len/2, 2 ];
132133
f = createBenchmark( len, sh, t1 );
133-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
134+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
134135

135136
sh = [ 2, len/2 ];
136137
f = createBenchmark( len, sh, t1 );
137-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
138-
138+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
139139
len = floor( sqrt( len ) );
140140
sh = [ len, len ];
141141
len *= len;
142142
f = createBenchmark( len, sh, t1 );
143-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
143+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
144144
}
145145
}
146146
}

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.2d_rowmajor_accessors.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var sqrt = require( '@stdlib/math/base/special/sqrt' );
2929
var floor = require( '@stdlib/math/base/special/floor' );
3030
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
3131
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
32+
var format = require( '@stdlib/string/format' );
3233
var pkg = require( './../package.json' ).name;
3334
var find = require( './../lib/2d_accessors.js' );
3435

@@ -156,17 +157,16 @@ function main() {
156157

157158
sh = [ len/2, 2 ];
158159
f = createBenchmark( len, sh, t1 );
159-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
160+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
160161

161162
sh = [ 2, len/2 ];
162163
f = createBenchmark( len, sh, t1 );
163-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
164-
164+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
165165
len = floor( sqrt( len ) );
166166
sh = [ len, len ];
167167
len *= len;
168168
f = createBenchmark( len, sh, t1 );
169-
bench( pkg+'::accessors:ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
169+
bench( format( '%s::accessors:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
170170
}
171171
}
172172
}

lib/node_modules/@stdlib/ndarray/base/find/benchmark/benchmark.3d_columnmajor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var cbrt = require( '@stdlib/math/base/special/cbrt' );
2929
var floor = require( '@stdlib/math/base/special/floor' );
3030
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
3131
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' );
32+
var format = require( '@stdlib/string/format' );
3233
var pkg = require( './../package.json' ).name;
3334
var find = require( './../lib/3d.js' );
3435

@@ -130,17 +131,16 @@ function main() {
130131

131132
sh = [ len/2, 2, 1 ];
132133
f = createBenchmark( len, sh, t1 );
133-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
134+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
134135

135136
sh = [ 1, 2, len/2 ];
136137
f = createBenchmark( len, sh, t1 );
137-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
138-
138+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
139139
len = floor( cbrt( len ) );
140140
sh = [ len, len, len ];
141141
len *= len * len;
142142
f = createBenchmark( len, sh, t1 );
143-
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f );
143+
bench( format( '%s:ndims=%d,len=%d,shape=[%s],xorder=%s,xtype=%s', pkg, sh.length, len, sh.join( ',' ), order, t1 ), f );
144144
}
145145
}
146146
}

0 commit comments

Comments
 (0)