Skip to content

Commit f0f361b

Browse files
upgrade dependencies
1 parent ac822c4 commit f0f361b

File tree

11 files changed

+785
-870
lines changed

11 files changed

+785
-870
lines changed

js/dist/sort.js

Lines changed: 617 additions & 708 deletions
Large diffs are not rendered by default.

js/dist/sort.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/dist/sort.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"test": "./node_modules/.bin/aureooms-node-package-test"
77
},
88
"devDependencies": {
9-
"aureooms-node-package": "^2.0.3",
10-
"aureooms-js-itertools": "^0.2.0",
9+
"aureooms-node-package": "^4.2.3",
10+
"aureooms-js-itertools": "^1.1.1",
1111
"aureooms-js-functools": "^2.0.3",
12-
"aureooms-js-compare": "^1.4.1",
12+
"aureooms-js-compare": "^1.4.3",
1313
"aureooms-js-random": "^1.0.1",
14-
"aureooms-js-search": "^0.0.3",
15-
"aureooms-js-array": "^2.0.2"
14+
"aureooms-js-search": "^0.0.4",
15+
"aureooms-js-array": "^2.2.0"
1616
},
1717
"main": "js/dist/sort.js",
1818
"bugs": {

pkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
},
1414
"debug": false,
1515
"src": "js/src/",
16-
"out": "js/dist/"
16+
"out": "js/dist/",
17+
"babel" : true
1718
}

test/js/src/inplacesort.js

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,22 @@ var check = function ( sortname, method, ctor, n, comparename, compare ) {
3636
} );
3737
};
3838

39+
itertools.exhaust( itertools.map(
40+
function ( args ) {
41+
42+
functools.star( function ( sortname, sort, comparename, compare, size, type ) {
43+
44+
if ( type.BYTES_PER_ELEMENT && size > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
45+
return;
46+
}
47+
48+
check( sortname, sort, type, size, comparename, compare );
49+
50+
}, itertools.list( itertools.chain( args ) ) ) ;
51+
52+
} ,
53+
54+
3955
itertools.product( [
4056

4157
[
@@ -57,30 +73,18 @@ itertools.product( [
5773
[ "decreasing", compare.decreasing ]
5874
],
5975

60-
[0, 1, 2, 10, 63, 64, 65],
76+
[[0], [1], [2], [10], [63], [64], [65]],
6177

6278
[
63-
Array,
64-
Int8Array,
65-
Uint8Array,
66-
Int16Array,
67-
Uint16Array,
68-
Int32Array,
69-
Uint32Array,
70-
Float32Array,
71-
Float64Array
79+
[ Array ],
80+
[ Int8Array ],
81+
[ Uint8Array ],
82+
[ Int16Array ],
83+
[ Uint16Array ],
84+
[ Int32Array ],
85+
[ Uint32Array ],
86+
[ Float32Array ],
87+
[ Float64Array ]
7288
]
7389

74-
], 1, [] ).forEach( function ( args ) {
75-
76-
functools.star( function ( sortname, sort, comparename, compare, size, type ) {
77-
78-
if ( type.BYTES_PER_ELEMENT && size > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
79-
return;
80-
}
81-
82-
check( sortname, sort, type, size, comparename, compare );
83-
84-
}, args );
85-
86-
} );
90+
], 1 ) ) );

test/js/src/merge.js

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,25 @@ all = function ( comparename, compare, mergename, merge, m, n, type ) {
4646
});
4747
};
4848

49+
itertools.exhaust( itertools.map(
50+
51+
functools.chain( [ itertools.chain , itertools.list , functools.partial( functools.star,
52+
53+
[ function ( comparename, compare, mergename, merge, m, n, type ) {
54+
55+
if ( type.BYTES_PER_ELEMENT && m > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
56+
return;
57+
}
58+
59+
if ( m < n ) {
60+
return;
61+
}
62+
63+
all( comparename, compare, mergename, merge, m, n, type );
64+
65+
} ]
66+
) ] ),
67+
4968
itertools.product([
5069

5170
[
@@ -59,37 +78,19 @@ itertools.product([
5978
[ "tapemerge" , sort.tapemerge ]
6079
],
6180

62-
[0, 1, 2, 10, 63, 64, 65],
63-
[0, 1, 2, 10, 63, 64, 65],
81+
[[0], [1], [2], [10], [63], [64], [65]],
82+
[[0], [1], [2], [10], [63], [64], [65]],
6483

6584
[
66-
Array,
67-
Int8Array,
68-
Uint8Array,
69-
Int16Array,
70-
Uint16Array,
71-
Int32Array,
72-
Uint32Array,
73-
Float32Array,
74-
Float64Array
85+
[ Array ],
86+
[ Int8Array ],
87+
[ Uint8Array ],
88+
[ Int16Array ],
89+
[ Uint16Array ],
90+
[ Int32Array ],
91+
[ Uint32Array ],
92+
[ Float32Array ],
93+
[ Float64Array ]
7594
]
7695

77-
], 1, [] ).forEach(
78-
79-
functools.partial( functools.star,
80-
81-
function ( comparename, compare, mergename, merge, m, n, type ) {
82-
83-
if ( type.BYTES_PER_ELEMENT && m > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
84-
return;
85-
}
86-
87-
if ( m < n ) {
88-
return;
89-
}
90-
91-
all( comparename, compare, mergename, merge, m, n, type );
92-
93-
}
94-
)
95-
);
96+
], 1 ) ) ) ;

test/js/src/mergesort.js

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,18 @@ var mergesort = function ( compare , a , ai , aj , b , bi , bj ) {
7171
}
7272

7373
} ;
74+
itertools.exhaust( itertools.map(
75+
functools.chain( [ itertools.chain , itertools.list , functools.partial( functools.star,
7476

77+
[ function ( comparename, compare, mergesortname, mergesort, n, type ) {
78+
79+
if ( type.BYTES_PER_ELEMENT && n > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
80+
return;
81+
}
82+
83+
all( comparename, compare, mergesortname, mergesort, n, type );
84+
} ]
85+
) ] ),
7586
itertools.product( [
7687

7788
[
@@ -84,32 +95,18 @@ itertools.product( [
8495
[ "iterative mergesort" , iterativemergesort ]
8596
],
8697

87-
[0 , 1 , 2 , 5 , 9 , 10 , 11 , 13 , 17 , 63 , 64 , 65 ] ,
98+
[ [0] , [1] , [2] , [5] , [9] , [10] , [11] , [13] , [17] , [63] , [64] , [65] ] ,
8899

89100
[
90-
Array,
91-
Int8Array,
92-
Uint8Array,
93-
Int16Array,
94-
Uint16Array,
95-
Int32Array,
96-
Uint32Array,
97-
Float32Array,
98-
Float64Array
101+
[ Array ],
102+
[ Int8Array ],
103+
[ Uint8Array ],
104+
[ Int16Array ],
105+
[ Uint16Array ],
106+
[ Int32Array ],
107+
[ Uint32Array ],
108+
[ Float32Array ],
109+
[ Float64Array ]
99110
]
100111

101-
], 1, [] ).forEach(
102-
103-
functools.partial( functools.star,
104-
105-
function ( comparename, compare, mergesortname, mergesort, n, type ) {
106-
107-
if ( type.BYTES_PER_ELEMENT && n > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
108-
return;
109-
}
110-
111-
all( comparename, compare, mergesortname, mergesort, n, type );
112-
}
113-
)
114-
115-
);
112+
], 1 ) ) ) ;

test/js/src/multiselect.js

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,20 @@ all = function ( partitionname, partition, comparename, comparator, n, type ) {
5454
});
5555
};
5656

57+
itertools.exhaust( itertools.map(
58+
59+
functools.chain( [ itertools.chain , itertools.list , functools.partial( functools.star,
60+
61+
[ function ( partitionname, partition, comparename, compare, n, type ) {
62+
63+
if ( type.BYTES_PER_ELEMENT && n > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
64+
return;
65+
}
66+
67+
all( partitionname, partition, comparename, compare, n, type );
68+
} ]
69+
) ] ) ,
70+
5771
itertools.product( [
5872

5973
[
@@ -66,32 +80,18 @@ itertools.product( [
6680
[ "decreasing", compare.decreasing ]
6781
],
6882

69-
[0, 1, 2, 10, 63, 64, 65],
83+
[[0], [1], [2], [10], [63], [64], [65]],
7084

7185
[
72-
Array,
73-
Int8Array,
74-
Uint8Array,
75-
Int16Array,
76-
Uint16Array,
77-
Int32Array,
78-
Uint32Array,
79-
Float32Array,
80-
Float64Array
86+
[ Array ],
87+
[ Int8Array ],
88+
[ Uint8Array ],
89+
[ Int16Array ],
90+
[ Uint16Array ],
91+
[ Int32Array ],
92+
[ Uint32Array ],
93+
[ Float32Array ],
94+
[ Float64Array ]
8195
]
8296

83-
], 1, [] ).forEach(
84-
85-
functools.partial( functools.star,
86-
87-
function ( partitionname, partition, comparename, compare, n, type ) {
88-
89-
if ( type.BYTES_PER_ELEMENT && n > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
90-
return;
91-
}
92-
93-
all( partitionname, partition, comparename, compare, n, type );
94-
}
95-
)
96-
97-
);
97+
], 1 ) ) ) ;

test/js/src/quickselect.js

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,20 @@ all = function ( quickselectname, quickselect, comparename, compare, n, type ) {
4040
});
4141
};
4242

43+
itertools.exhaust( itertools.map(
44+
45+
functools.chain( [ itertools.chain , itertools.list , functools.partial( functools.star,
46+
47+
[ function ( quickselectname, quickselect, comparename, compare, n, type ) {
48+
49+
if ( type.BYTES_PER_ELEMENT && n > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
50+
return;
51+
}
52+
53+
all( quickselectname, quickselect, comparename, compare, n, type );
54+
} ]
55+
) ] ) ,
56+
4357
itertools.product( [
4458

4559
[
@@ -52,32 +66,18 @@ itertools.product( [
5266
[ "decreasing", compare.decreasing ]
5367
],
5468

55-
[0, 1, 2, 10, 31, 32, 33],
69+
[ [0], [1], [2], [10], [31], [32], [33] ],
5670

5771
[
58-
Array,
59-
Int8Array,
60-
Uint8Array,
61-
Int16Array,
62-
Uint16Array,
63-
Int32Array,
64-
Uint32Array,
65-
Float32Array,
66-
Float64Array
72+
[ Array ],
73+
[ Int8Array ],
74+
[ Uint8Array ],
75+
[ Int16Array ],
76+
[ Uint16Array ],
77+
[ Int32Array ],
78+
[ Uint32Array ],
79+
[ Float32Array ],
80+
[ Float64Array ]
6781
]
6882

69-
], 1, [] ).forEach(
70-
71-
functools.partial( functools.star,
72-
73-
function ( quickselectname, quickselect, comparename, compare, n, type ) {
74-
75-
if ( type.BYTES_PER_ELEMENT && n > Math.pow( 2, type.BYTES_PER_ELEMENT * 8 ) ) {
76-
return;
77-
}
78-
79-
all( quickselectname, quickselect, comparename, compare, n, type );
80-
}
81-
)
82-
83-
);
83+
], 1 ) ) ) ;

0 commit comments

Comments
 (0)