Skip to content

Commit caa0902

Browse files
kgrytekgryte
committed
Refactor to ignore iterator return values
1 parent 1a57c9e commit caa0902

File tree

28 files changed

+135
-929
lines changed

28 files changed

+135
-929
lines changed

‎lib/node_modules/@stdlib/stats/iter/cugmean/lib/main.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
var setReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-property' );
2424
var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
2525
var isFunction = require( '@stdlib/assert/is-function' );
26-
var hasOwnProp = require( '@stdlib/assert/has-own-property' );
2726
var iteratorSymbol = require( '@stdlib/symbol/iterator' );
2827
var incrgmean = require( '@stdlib/stats/incr/gmean' );
2928

@@ -84,27 +83,26 @@ function itercugmean( iterator ) {
8483
* @returns {Object} iterator protocol-compliant object
8584
*/
8685
function next() {
87-
var out;
8886
var v;
8987
if ( FLG ) {
9088
return {
9189
'done': true
9290
};
9391
}
94-
out = {};
9592
v = iterator.next();
96-
if ( typeof v.value === 'number' ) {
97-
out.value = acc( v.value );
98-
} else if ( hasOwnProp( v, 'value' ) ) {
99-
out.value = acc( NaN );
100-
}
10193
if ( v.done ) {
10294
FLG = true;
103-
out.done = true;
95+
return v;
96+
}
97+
if ( typeof v.value === 'number' ) {
98+
v = acc( v.value );
10499
} else {
105-
out.done = false;
100+
v = acc( NaN );
106101
}
107-
return out;
102+
return {
103+
'value': v,
104+
'done': false
105+
};
108106
}
109107

110108
/**

‎lib/node_modules/@stdlib/stats/iter/cugmean/test/test.js‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -101,69 +101,6 @@ tape( 'the function returns an iterator protocol-compliant object which iterativ
101101
t.end();
102102
});
103103

104-
tape( 'the function returns an iterator protocol-compliant object which iteratively computes a cumulative geometric mean (value+done)', function test( t ) {
105-
var expected;
106-
var actual;
107-
var values;
108-
var acc;
109-
var it;
110-
var v;
111-
var i;
112-
113-
acc = incrgmean();
114-
115-
values = [ 2.0, 3.0, 2.0, 4.0, 3.0, 4.0 ];
116-
expected = [];
117-
for ( i = 0; i < values.length; i++ ) {
118-
expected.push( acc( values[ i ] ) );
119-
}
120-
it = itercugmean( createIterator( values ) );
121-
t.equal( it.next.length, 0, 'has zero arity' );
122-
123-
actual = [];
124-
for ( i = 0; i < values.length; i++ ) {
125-
v = it.next();
126-
t.equal( typeof v.value, 'number', 'returns a number' );
127-
t.equal( typeof v.done, 'boolean', 'returns a boolean' );
128-
actual.push( v.value );
129-
}
130-
t.deepEqual( actual, expected, 'returns expected values' );
131-
132-
v = it.next();
133-
t.equal( v.value, void 0, 'returns expected value' );
134-
t.equal( v.done, true, 'returns expected value' );
135-
136-
t.end();
137-
138-
function createIterator( arr ) {
139-
var len;
140-
var it;
141-
var i;
142-
143-
len = arr.length;
144-
i = -1;
145-
146-
it = {};
147-
it.next = next;
148-
149-
return it;
150-
151-
function next() {
152-
var out;
153-
i += 1;
154-
if ( i < len ) {
155-
out = {};
156-
out.value = arr[ i ];
157-
out.done = ( i === len-1 );
158-
return out;
159-
}
160-
return {
161-
'done': true
162-
};
163-
}
164-
}
165-
});
166-
167104
tape( 'if an iterated value is a non-numeric value, the computed geometric mean is `NaN`', function test( t ) {
168105
var expected;
169106
var values;

‎lib/node_modules/@stdlib/stats/iter/cuhmean/lib/main.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
var setReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-property' );
2424
var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
2525
var isFunction = require( '@stdlib/assert/is-function' );
26-
var hasOwnProp = require( '@stdlib/assert/has-own-property' );
2726
var iteratorSymbol = require( '@stdlib/symbol/iterator' );
2827
var incrhmean = require( '@stdlib/stats/incr/hmean' );
2928

@@ -84,27 +83,26 @@ function itercuhmean( iterator ) {
8483
* @returns {Object} iterator protocol-compliant object
8584
*/
8685
function next() {
87-
var out;
8886
var v;
8987
if ( FLG ) {
9088
return {
9189
'done': true
9290
};
9391
}
94-
out = {};
9592
v = iterator.next();
96-
if ( typeof v.value === 'number' ) {
97-
out.value = acc( v.value );
98-
} else if ( hasOwnProp( v, 'value' ) ) {
99-
out.value = acc( NaN );
100-
}
10193
if ( v.done ) {
10294
FLG = true;
103-
out.done = true;
95+
return v;
96+
}
97+
if ( typeof v.value === 'number' ) {
98+
v = acc( v.value );
10499
} else {
105-
out.done = false;
100+
v = acc( NaN );
106101
}
107-
return out;
102+
return {
103+
'value': v,
104+
'done': false
105+
};
108106
}
109107

110108
/**

‎lib/node_modules/@stdlib/stats/iter/cuhmean/test/test.js‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -101,69 +101,6 @@ tape( 'the function returns an iterator protocol-compliant object which iterativ
101101
t.end();
102102
});
103103

104-
tape( 'the function returns an iterator protocol-compliant object which iteratively computes a cumulative harmonic mean (value+done)', function test( t ) {
105-
var expected;
106-
var actual;
107-
var values;
108-
var acc;
109-
var it;
110-
var v;
111-
var i;
112-
113-
acc = incrhmean();
114-
115-
values = [ 2.0, 3.0, 2.0, 4.0, 3.0, 4.0 ];
116-
expected = [];
117-
for ( i = 0; i < values.length; i++ ) {
118-
expected.push( acc( values[ i ] ) );
119-
}
120-
it = itercuhmean( createIterator( values ) );
121-
t.equal( it.next.length, 0, 'has zero arity' );
122-
123-
actual = [];
124-
for ( i = 0; i < values.length; i++ ) {
125-
v = it.next();
126-
t.equal( typeof v.value, 'number', 'returns a number' );
127-
t.equal( typeof v.done, 'boolean', 'returns a boolean' );
128-
actual.push( v.value );
129-
}
130-
t.deepEqual( actual, expected, 'returns expected values' );
131-
132-
v = it.next();
133-
t.equal( v.value, void 0, 'returns expected value' );
134-
t.equal( v.done, true, 'returns expected value' );
135-
136-
t.end();
137-
138-
function createIterator( arr ) {
139-
var len;
140-
var it;
141-
var i;
142-
143-
len = arr.length;
144-
i = -1;
145-
146-
it = {};
147-
it.next = next;
148-
149-
return it;
150-
151-
function next() {
152-
var out;
153-
i += 1;
154-
if ( i < len ) {
155-
out = {};
156-
out.value = arr[ i ];
157-
out.done = ( i === len-1 );
158-
return out;
159-
}
160-
return {
161-
'done': true
162-
};
163-
}
164-
}
165-
});
166-
167104
tape( 'if an iterated value is a non-numeric value, the computed harmonic mean is `NaN`', function test( t ) {
168105
var expected;
169106
var values;

‎lib/node_modules/@stdlib/stats/iter/cumax/lib/main.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
var setReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-property' );
2424
var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
2525
var isFunction = require( '@stdlib/assert/is-function' );
26-
var hasOwnProp = require( '@stdlib/assert/has-own-property' );
2726
var iteratorSymbol = require( '@stdlib/symbol/iterator' );
2827
var incrmax = require( '@stdlib/stats/incr/max' );
2928

@@ -84,27 +83,26 @@ function itercumax( iterator ) {
8483
* @returns {Object} iterator protocol-compliant object
8584
*/
8685
function next() {
87-
var out;
8886
var v;
8987
if ( FLG ) {
9088
return {
9189
'done': true
9290
};
9391
}
94-
out = {};
9592
v = iterator.next();
96-
if ( typeof v.value === 'number' ) {
97-
out.value = acc( v.value );
98-
} else if ( hasOwnProp( v, 'value' ) ) {
99-
out.value = acc( NaN );
100-
}
10193
if ( v.done ) {
10294
FLG = true;
103-
out.done = true;
95+
return v;
96+
}
97+
if ( typeof v.value === 'number' ) {
98+
v = acc( v.value );
10499
} else {
105-
out.done = false;
100+
v = acc( NaN );
106101
}
107-
return out;
102+
return {
103+
'value': v,
104+
'done': false
105+
};
108106
}
109107

110108
/**

‎lib/node_modules/@stdlib/stats/iter/cumax/test/test.js‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -95,64 +95,6 @@ tape( 'the function returns an iterator protocol-compliant object which iterativ
9595
t.end();
9696
});
9797

98-
tape( 'the function returns an iterator protocol-compliant object which iteratively computes a cumulative maximum value (value+done)', function test( t ) {
99-
var expected;
100-
var actual;
101-
var values;
102-
var it;
103-
var v;
104-
var i;
105-
106-
values = [ 2.0, 3.0, 2.0, 4.0, 3.0, 4.0 ];
107-
expected = [ 2.0, 3.0, 3.0, 4.0, 4.0, 4.0 ];
108-
109-
it = itercumax( createIterator( values ) );
110-
t.equal( it.next.length, 0, 'has zero arity' );
111-
112-
actual = [];
113-
for ( i = 0; i < values.length; i++ ) {
114-
v = it.next();
115-
t.equal( typeof v.value, 'number', 'returns a number' );
116-
t.equal( typeof v.done, 'boolean', 'returns a boolean' );
117-
actual.push( v.value );
118-
}
119-
t.deepEqual( actual, expected, 'returns expected values' );
120-
121-
v = it.next();
122-
t.equal( v.value, void 0, 'returns expected value' );
123-
t.equal( v.done, true, 'returns expected value' );
124-
125-
t.end();
126-
127-
function createIterator( arr ) {
128-
var len;
129-
var it;
130-
var i;
131-
132-
len = arr.length;
133-
i = -1;
134-
135-
it = {};
136-
it.next = next;
137-
138-
return it;
139-
140-
function next() {
141-
var out;
142-
i += 1;
143-
if ( i < len ) {
144-
out = {};
145-
out.value = arr[ i ];
146-
out.done = ( i === len-1 );
147-
return out;
148-
}
149-
return {
150-
'done': true
151-
};
152-
}
153-
}
154-
});
155-
15698
tape( 'if an iterated value is a non-numeric value, the computed maximum value is `NaN`', function test( t ) {
15799
var expected;
158100
var values;

‎lib/node_modules/@stdlib/stats/iter/cumaxabs/lib/main.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
var setReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-property' );
2424
var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
2525
var isFunction = require( '@stdlib/assert/is-function' );
26-
var hasOwnProp = require( '@stdlib/assert/has-own-property' );
2726
var iteratorSymbol = require( '@stdlib/symbol/iterator' );
2827
var incrmaxabs = require( '@stdlib/stats/incr/maxabs' );
2928

@@ -84,27 +83,26 @@ function itercumaxabs( iterator ) {
8483
* @returns {Object} iterator protocol-compliant object
8584
*/
8685
function next() {
87-
var out;
8886
var v;
8987
if ( FLG ) {
9088
return {
9189
'done': true
9290
};
9391
}
94-
out = {};
9592
v = iterator.next();
96-
if ( typeof v.value === 'number' ) {
97-
out.value = acc( v.value );
98-
} else if ( hasOwnProp( v, 'value' ) ) {
99-
out.value = acc( NaN );
100-
}
10193
if ( v.done ) {
10294
FLG = true;
103-
out.done = true;
95+
return v;
96+
}
97+
if ( typeof v.value === 'number' ) {
98+
v = acc( v.value );
10499
} else {
105-
out.done = false;
100+
v = acc( NaN );
106101
}
107-
return out;
102+
return {
103+
'value': v,
104+
'done': false
105+
};
108106
}
109107

110108
/**

0 commit comments

Comments
 (0)