Skip to content

Commit 14c965b

Browse files
authored
bench: refactor to use string interpolation in ndarray/vector/ctor
PR-URL: #11076 Ref: #8647 Reviewed-by: Athan Reines <kgryte@gmail.com>
1 parent 427a1e2 commit 14c965b

File tree

4 files changed

+31
-27
lines changed

4 files changed

+31
-27
lines changed

lib/node_modules/@stdlib/ndarray/vector/ctor/benchmark/benchmark.factory.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ var bench = require( '@stdlib/bench' );
2424
var isFunction = require( '@stdlib/assert/is-function' );
2525
var isndarrayLike = require( '@stdlib/assert/is-ndarray-like' );
2626
var dtypes = require( '@stdlib/ndarray/dtypes' );
27+
var format = require( '@stdlib/string/format' );
2728
var pkg = require( './../package.json' ).name;
2829
var factory = require( './../lib' ).factory;
2930

3031

3132
// MAIN //
3233

33-
bench( pkg+':factory', function benchmark( b ) {
34+
bench( format( '%s:factory', pkg ), function benchmark( b ) {
3435
var values;
3536
var v;
3637
var i;
@@ -52,7 +53,7 @@ bench( pkg+':factory', function benchmark( b ) {
5253
b.end();
5354
});
5455

55-
bench( pkg+':factory:dtype=float64', function benchmark( b ) {
56+
bench( format( '%s:factory:dtype=float64', pkg ), function benchmark( b ) {
5657
var vector;
5758
var arr;
5859
var i;
@@ -74,7 +75,7 @@ bench( pkg+':factory:dtype=float64', function benchmark( b ) {
7475
b.end();
7576
});
7677

77-
bench( pkg+':factory:dtype=float32', function benchmark( b ) {
78+
bench( format( '%s:factory:dtype=float32', pkg ), function benchmark( b ) {
7879
var vector;
7980
var arr;
8081
var i;
@@ -96,7 +97,7 @@ bench( pkg+':factory:dtype=float32', function benchmark( b ) {
9697
b.end();
9798
});
9899

99-
bench( pkg+':factory:dtype=complex128', function benchmark( b ) {
100+
bench( format( '%s:factory:dtype=complex128', pkg ), function benchmark( b ) {
100101
var vector;
101102
var arr;
102103
var i;
@@ -118,7 +119,7 @@ bench( pkg+':factory:dtype=complex128', function benchmark( b ) {
118119
b.end();
119120
});
120121

121-
bench( pkg+':factory:dtype=complex64', function benchmark( b ) {
122+
bench( format( '%s:factory:dtype=complex64', pkg ), function benchmark( b ) {
122123
var vector;
123124
var arr;
124125
var i;
@@ -140,7 +141,7 @@ bench( pkg+':factory:dtype=complex64', function benchmark( b ) {
140141
b.end();
141142
});
142143

143-
bench( pkg+':factory:dtype=int32', function benchmark( b ) {
144+
bench( format( '%s:factory:dtype=int32', pkg ), function benchmark( b ) {
144145
var vector;
145146
var arr;
146147
var i;
@@ -162,7 +163,7 @@ bench( pkg+':factory:dtype=int32', function benchmark( b ) {
162163
b.end();
163164
});
164165

165-
bench( pkg+':factory:dtype=uint32', function benchmark( b ) {
166+
bench( format( '%s:factory:dtype=uint32', pkg ), function benchmark( b ) {
166167
var vector;
167168
var arr;
168169
var i;
@@ -184,7 +185,7 @@ bench( pkg+':factory:dtype=uint32', function benchmark( b ) {
184185
b.end();
185186
});
186187

187-
bench( pkg+':factory:dtype=int16', function benchmark( b ) {
188+
bench( format( '%s:factory:dtype=int16', pkg ), function benchmark( b ) {
188189
var vector;
189190
var arr;
190191
var i;
@@ -206,7 +207,7 @@ bench( pkg+':factory:dtype=int16', function benchmark( b ) {
206207
b.end();
207208
});
208209

209-
bench( pkg+':factory:dtype=uint16', function benchmark( b ) {
210+
bench( format( '%s:factory:dtype=uint16', pkg ), function benchmark( b ) {
210211
var vector;
211212
var arr;
212213
var i;
@@ -228,7 +229,7 @@ bench( pkg+':factory:dtype=uint16', function benchmark( b ) {
228229
b.end();
229230
});
230231

231-
bench( pkg+':factory:dtype=int8', function benchmark( b ) {
232+
bench( format( '%s:factory:dtype=int8', pkg ), function benchmark( b ) {
232233
var vector;
233234
var arr;
234235
var i;
@@ -250,7 +251,7 @@ bench( pkg+':factory:dtype=int8', function benchmark( b ) {
250251
b.end();
251252
});
252253

253-
bench( pkg+':factory:dtype=uint8', function benchmark( b ) {
254+
bench( format( '%s:factory:dtype=uint8', pkg ), function benchmark( b ) {
254255
var vector;
255256
var arr;
256257
var i;
@@ -272,7 +273,7 @@ bench( pkg+':factory:dtype=uint8', function benchmark( b ) {
272273
b.end();
273274
});
274275

275-
bench( pkg+':factory:dtype=uint8c', function benchmark( b ) {
276+
bench( format( '%s:factory:dtype=uint8c', pkg ), function benchmark( b ) {
276277
var vector;
277278
var arr;
278279
var i;
@@ -294,7 +295,7 @@ bench( pkg+':factory:dtype=uint8c', function benchmark( b ) {
294295
b.end();
295296
});
296297

297-
bench( pkg+':factory:dtype=generic', function benchmark( b ) {
298+
bench( format( '%s:factory:dtype=generic', pkg ), function benchmark( b ) {
298299
var vector;
299300
var arr;
300301
var i;

lib/node_modules/@stdlib/ndarray/vector/ctor/benchmark/benchmark.factory.size.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var bench = require( '@stdlib/bench' );
2424
var pow = require( '@stdlib/math/base/special/pow' );
2525
var isndarrayLike = require( '@stdlib/assert/is-ndarray-like' );
2626
var dtypes = require( '@stdlib/ndarray/dtypes' );
27+
var format = require( '@stdlib/string/format' );
2728
var pkg = require( './../package.json' ).name;
2829
var factory = require( './../lib' ).factory;
2930

@@ -98,7 +99,7 @@ function main() {
9899
for ( i = min; i <= max; i++ ) {
99100
len = pow( 10, i );
100101
f = createBenchmark( len, dt );
101-
bench( pkg+':factory:dtype='+dt+',size='+len, f );
102+
bench( format( '%s:factory:dtype=%s,size=%d', pkg, dt, len ), f );
102103
}
103104
}
104105
}

lib/node_modules/@stdlib/ndarray/vector/ctor/benchmark/benchmark.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
var bench = require( '@stdlib/bench' );
2424
var isndarrayLike = require( '@stdlib/assert/is-ndarray-like' );
25+
var format = require( '@stdlib/string/format' );
2526
var pkg = require( './../package.json' ).name;
2627
var vector = require( './../lib' );
2728

@@ -46,7 +47,7 @@ bench( pkg, function benchmark( b ) {
4647
b.end();
4748
});
4849

49-
bench( pkg+':dtype=float64', function benchmark( b ) {
50+
bench( format( '%s:dtype=float64', pkg ), function benchmark( b ) {
5051
var arr;
5152
var i;
5253
b.tic();
@@ -64,7 +65,7 @@ bench( pkg+':dtype=float64', function benchmark( b ) {
6465
b.end();
6566
});
6667

67-
bench( pkg+':dtype=float32', function benchmark( b ) {
68+
bench( format( '%s:dtype=float32', pkg ), function benchmark( b ) {
6869
var arr;
6970
var i;
7071
b.tic();
@@ -82,7 +83,7 @@ bench( pkg+':dtype=float32', function benchmark( b ) {
8283
b.end();
8384
});
8485

85-
bench( pkg+':dtype=complex128', function benchmark( b ) {
86+
bench( format( '%s:dtype=complex128', pkg ), function benchmark( b ) {
8687
var arr;
8788
var i;
8889
b.tic();
@@ -100,7 +101,7 @@ bench( pkg+':dtype=complex128', function benchmark( b ) {
100101
b.end();
101102
});
102103

103-
bench( pkg+':dtype=complex64', function benchmark( b ) {
104+
bench( format( '%s:dtype=complex64', pkg ), function benchmark( b ) {
104105
var arr;
105106
var i;
106107
b.tic();
@@ -118,7 +119,7 @@ bench( pkg+':dtype=complex64', function benchmark( b ) {
118119
b.end();
119120
});
120121

121-
bench( pkg+':dtype=int32', function benchmark( b ) {
122+
bench( format( '%s:dtype=int32', pkg ), function benchmark( b ) {
122123
var arr;
123124
var i;
124125
b.tic();
@@ -136,7 +137,7 @@ bench( pkg+':dtype=int32', function benchmark( b ) {
136137
b.end();
137138
});
138139

139-
bench( pkg+':dtype=uint32', function benchmark( b ) {
140+
bench( format( '%s:dtype=uint32', pkg ), function benchmark( b ) {
140141
var arr;
141142
var i;
142143
b.tic();
@@ -154,7 +155,7 @@ bench( pkg+':dtype=uint32', function benchmark( b ) {
154155
b.end();
155156
});
156157

157-
bench( pkg+':dtype=int16', function benchmark( b ) {
158+
bench( format( '%s:dtype=int16', pkg ), function benchmark( b ) {
158159
var arr;
159160
var i;
160161
b.tic();
@@ -172,7 +173,7 @@ bench( pkg+':dtype=int16', function benchmark( b ) {
172173
b.end();
173174
});
174175

175-
bench( pkg+':dtype=uint16', function benchmark( b ) {
176+
bench( format( '%s:dtype=uint16', pkg ), function benchmark( b ) {
176177
var arr;
177178
var i;
178179
b.tic();
@@ -190,7 +191,7 @@ bench( pkg+':dtype=uint16', function benchmark( b ) {
190191
b.end();
191192
});
192193

193-
bench( pkg+':dtype=int8', function benchmark( b ) {
194+
bench( format( '%s:dtype=int8', pkg ), function benchmark( b ) {
194195
var arr;
195196
var i;
196197
b.tic();
@@ -208,7 +209,7 @@ bench( pkg+':dtype=int8', function benchmark( b ) {
208209
b.end();
209210
});
210211

211-
bench( pkg+':dtype=uint8', function benchmark( b ) {
212+
bench( format( '%s:dtype=uint8', pkg ), function benchmark( b ) {
212213
var arr;
213214
var i;
214215
b.tic();
@@ -226,7 +227,7 @@ bench( pkg+':dtype=uint8', function benchmark( b ) {
226227
b.end();
227228
});
228229

229-
bench( pkg+':dtype=uint8c', function benchmark( b ) {
230+
bench( format( '%s:dtype=uint8c', pkg ), function benchmark( b ) {
230231
var arr;
231232
var i;
232233
b.tic();
@@ -244,7 +245,7 @@ bench( pkg+':dtype=uint8c', function benchmark( b ) {
244245
b.end();
245246
});
246247

247-
bench( pkg+':dtype=generic', function benchmark( b ) {
248+
bench( format( '%s:dtype=generic', pkg ), function benchmark( b ) {
248249
var arr;
249250
var i;
250251
b.tic();

lib/node_modules/@stdlib/ndarray/vector/ctor/benchmark/benchmark.size.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var bench = require( '@stdlib/bench' );
2424
var pow = require( '@stdlib/math/base/special/pow' );
2525
var isndarrayLike = require( '@stdlib/assert/is-ndarray-like' );
2626
var dtypes = require( '@stdlib/ndarray/dtypes' );
27+
var format = require( '@stdlib/string/format' );
2728
var pkg = require( './../package.json' ).name;
2829
var vector = require( './../lib' );
2930

@@ -97,7 +98,7 @@ function main() {
9798
for ( i = min; i <= max; i++ ) {
9899
len = pow( 10, i );
99100
f = createBenchmark( len, dt );
100-
bench( pkg+':dtype='+dt+',size='+len, f );
101+
bench( format( '%s:dtype=%s:size=%d', pkg, dt, len ), f );
101102
}
102103
}
103104
}

0 commit comments

Comments
 (0)