fix sample test and add identical test for shuffle

make-github-pseudonymous-again · make-github-pseudonymous-again · commit 14e8f47213dd · 2014-10-13T20:37:12.000+02:00
diff --git a/test/js/src/sample.js b/test/js/src/sample.js
@@ -29,7 +29,7 @@ one = function ( type, sample ) {
 
 		test( name, function () {
 
-			var it, msg;
+			var it, msg, _a, _b;
 
 			array.copy( a, 0, n, b, 0 );
 			sample( k, b, i, j );
@@ -39,12 +39,14 @@ one = function ( type, sample ) {
 				deepEqual( b[it], a[it], msg );
 			}
 
-			for ( it = i ; it < i + k ; ++it ) {
-				msg = util.format( "b[%d] in a", it );
-				ok( operator.contains( a, b[it] ), msg );
-			}
+			_a = Array.prototype.slice.call( a, i, j ).sort( operator.sub );
+			_b = Array.prototype.slice.call( b, i, j ).sort( operator.sub );
+
+			msg = "shuffled region contains same elements as original";
+
+			deepEqual( _b, _a, msg );
 
-			for ( it = i + k ; it < n ; ++it ) {
+			for ( it = j ; it < n ; ++it ) {
 				msg = util.format( "b[%d] === a[%d]", it, it );
 				deepEqual( b[it], a[it], msg );
 			}
@@ -57,6 +59,7 @@ one = function ( type, sample ) {
 	range( n - 20, 20, n );
 	range( n - 20, 0, n - 20 );
 	range( n - 20, 10, n - 10 );
+	range( n - 30, 10, n - 10 );
 
 
 
diff --git a/test/js/src/shuffle.js b/test/js/src/shuffle.js
@@ -0,0 +1,94 @@
+
+var util, operator, array, mem, one, calloc;;
+
+util = require( "util" );
+
+mem = require( "aureooms-js-mem" );
+array = require( "aureooms-js-array" );
+operator = require( "aureooms-js-operator" );
+
+
+one = function ( type, shuffle ) {
+
+	var calloc, a, b, n, range;
+
+	calloc = mem.__calloc__( type );
+
+	n = 100;
+
+	a = calloc( n );
+	b = calloc( n );
+
+	array.iota( a, 0, n, 0 );
+
+	range = function ( i, j ) {
+
+		var name;
+
+		name = util.format( "shuffle ( %s, %s )", i, j );
+
+		test( name, function () {
+
+			var it, msg, _a, _b;
+
+			array.copy( a, 0, n, b, 0 );
+			shuffle( b, i, j );
+
+			for ( it = 0 ; it < i ; ++it ) {
+				msg = util.format( "b[%d] === a[%d]", it, it );
+				deepEqual( b[it], a[it], msg );
+			}
+
+			_a = Array.prototype.slice.call( a, i, j ).sort( operator.sub );
+			_b = Array.prototype.slice.call( b, i, j ).sort( operator.sub );
+
+			msg = "shuffled region contains same elements as original";
+
+			deepEqual( _b, _a, msg );
+
+			for ( it = j ; it < n ; ++it ) {
+				msg = util.format( "b[%d] === a[%d]", it, it );
+				deepEqual( b[it], a[it], msg );
+			}
+
+		});
+	};
+
+
+	range( 0, n );
+	range( 20, n );
+	range( 0, n - 20 );
+	range( 10, n - 10 );
+	range( 10, n - 10 );
+
+
+
+};
+
+types = [
+	Array,
+	Int8Array,
+	Int16Array,
+	Int32Array,
+	Uint8Array,
+	Uint16Array,
+	Uint32Array,
+	Uint8ClampedArray,
+	Float32Array,
+	Float64Array
+];
+
+algorithms = [
+	random.__shuffle__( random.__fisheryates__( random.randint ) ),
+	random.__shuffle__( random.__sample__( random.randint ) )
+];
+
+types.forEach( function ( type ) {
+
+	algorithms.forEach( function ( algorithm ) {
+
+		one( type, algorithm );
+
+	});
+
+});
