upgrade random and functools

Author: make-github-pseudonymous-again

package.json

@@ -8,9 +8,9 @@
 	"devDependencies": {
 		"aureooms-node-package": "^2.0.3",
 		"aureooms-js-itertools": "^0.2.0",
-		"aureooms-js-functools": "^1.0.0",
+		"aureooms-js-functools": "^2.0.3",
 		"aureooms-js-compare": "^1.4.1",
-		"aureooms-js-random": "^0.0.4",
+		"aureooms-js-random": "^1.0.1",
 		"aureooms-js-search": "^0.0.3",
 		"aureooms-js-array": "^2.0.2"
 	},
@@ -36,4 +36,4 @@
 		"type": "git"
 	},
 	"version": "5.0.3"
-}
+}

test/js/src/inplacesort.js

@@ -18,19 +18,14 @@ var check = function ( sortname, method, ctor, n, comparename, compare ) {
 
 	test( title, function () {
 
-		var randint, sample, shuffle, a;
-
-		// SETUP RANDOM
-		randint = random.randint;
-		sample = random.__sample__( randint );
-		shuffle = random.__shuffle__( sample );
+		var a ;
 
 		// SETUP ARRAY
 		a = new ctor(n);
 		array.iota( a, 0, n, 0 );
 
 		// SORT ARRAY
-		shuffle( a, 0, n );
+		random.shuffle( a, 0, n );
 		method( compare, a, 0, n );
 
 		// TEST PREDICATE

test/js/src/mergesort.js

@@ -1,4 +1,4 @@
-var all, util, array, random, compare, functools, itertools, shuffle;
+var all, util, array, random, compare, functools, itertools ;
 
 util = require( "util" );
 array = require( "aureooms-js-array" );
@@ -7,8 +7,6 @@ compare = require( "aureooms-js-compare" );
 functools = require( "aureooms-js-functools" );
 itertools = require( "aureooms-js-itertools" );
 
-shuffle = random.__shuffle__( random.__sample__( random.randint ) );
-
 all = function( comparename, compare, mergesortname, mergesort, n, type ) {
 
 	var title;
@@ -27,7 +25,7 @@ all = function( comparename, compare, mergesortname, mergesort, n, type ) {
 		array.iota( a, 0, n, 0 );
 
 		// SORT ARRAY
-		shuffle( a, 0, n );
+		random.shuffle( a, 0, n );
 		mergesort( compare, a, 0, n, d, 0, n );
 
 		deepEqual( sort.issorted( compare , d , 0 , n ) , n , "check sorted" );

test/js/src/multiselect.js

@@ -1,4 +1,4 @@
-var all, util, array, search, random, compare, functools, itertools, sample, shuffle;
+var all, util, array, search, random, compare, functools, itertools ;
 
 util = require( "util" );
 array = require( "aureooms-js-array" );
@@ -8,9 +8,6 @@ compare = require( "aureooms-js-compare" );
 functools = require( "aureooms-js-functools" );
 itertools = require( "aureooms-js-itertools" );
 
-sample = random.__sample__( random.randint );
-shuffle = random.__shuffle__( sample );
-
 all = function ( partitionname, partition, comparename, comparator, n, type ) {
 
 	var title;
@@ -30,7 +27,7 @@ all = function ( partitionname, partition, comparename, comparator, n, type ) {
 		// SETUP REF ARRAY
 		ref = new type( n );
 		array.iota( ref, 0, n, 0 );
-		shuffle( ref, 0, n );
+		random.shuffle( ref, 0, n );
 		array.sort( comparator, ref );
 
 		// SETUP TEST ARRAY
@@ -41,12 +38,12 @@ all = function ( partitionname, partition, comparename, comparator, n, type ) {
 		i = a.length;
 
 		len = random.randint( 0, i + 1 );
-		sample( len, a, 0, n );
+		random.sample( len, a, 0, n );
 		k = new type( len );
 		array.copy( a, 0, len, k, 0 );
 		array.sort( compare.increasing, k );
 
-		shuffle( a, 0, n );
+		random.shuffle( a, 0, n );
 		multiselect( comparator, a, 0, n, k, 0, len );
 
 		while ( len-- ) {

test/js/src/quickselect.js

@@ -1,4 +1,4 @@
-var all, util, array, random, compare, functools, itertools, shuffle;
+var all, util, array, random, compare, functools, itertools;
 
 util = require( "util" );
 array = require( "aureooms-js-array" );
@@ -7,8 +7,6 @@ compare = require( "aureooms-js-compare" );
 functools = require( "aureooms-js-functools" );
 itertools = require( "aureooms-js-itertools" );
 
-shuffle = random.__shuffle__( random.__sample__( random.randint ) );
-
 all = function ( quickselectname, quickselect, comparename, compare, n, type ) {
 
 	var title;
@@ -33,7 +31,7 @@ all = function ( quickselectname, quickselect, comparename, compare, n, type ) {
 		// TEST ALL INDEX SELECTION
 		i = a.length;
 		while ( i-- ) {
-			shuffle( a, 0, n );
+			random.shuffle( a, 0, n );
 			quickselect( compare, a, 0, n, i );
 			deepEqual( a[i], ref[i], "select #" + i );
 		}

test/js/src/whole.js

@@ -19,19 +19,14 @@ var check = function ( sortname, arraysort, ctor, n, comparename, compare ) {
 
 	test( title, function () {
 
-		var randint, sample, shuffle, a;
-
-		// SETUP RANDOM
-		randint = random.randint;
-		sample = random.__sample__( randint );
-		shuffle = random.__shuffle__( sample );
+		var a;
 
 		// SETUP ARRAY
 		a = new ctor(n);
 		array.iota( a, 0, n, 0 );
 
 		// SORT ARRAY
-		shuffle( a, 0, n );
+		random.shuffle( a, 0, n );
 		arraysort( compare, a );
 
 		deepEqual( sort.issorted( compare , a , 0 , n ) , n , "check sorted" );