draft + tests for randint and randfloat

make-github-pseudonymous-again · make-github-pseudonymous-again · commit d3e380ab1a8c · 2014-10-12T15:24:05.000+02:00
diff --git a/js/dist/random.js b/js/dist/random.js
@@ -3,49 +3,87 @@
 	'use strict';
 
 
-/* js/src/randint.js */
+/* js/src/fisheryates.js */
+
+/**
+ * Sample array using Fisher-Yates method.
+ */
+
+var __fisheryates__ = function ( randint ) {
+
+	var fisheryates = function ( n, a, i, j ) {
+
+		var k, p, tmp;
+
+		// we will swap at most n elements
+
+		k = i + n;
+
+		for ( ; i < k ; ++i ) {
+
+			// choose any index p in the remaining array
+
+			p = randint( i, j );
+
+
+			// swap element at index p with first element in the array
+
+			tmp  = a[i];
+			a[i] = a[p];
+			a[p] = tmp;
+
+		}
+
+	};
 
+	return fisheryates;
 
-var randint = function(i, j){
-	return i + Math.floor(Math.random() * (j - i));
 };
 
-exports.randint = randint;
-/* js/src/sample.js */
+exports.__fisheryates__ = __fisheryates__;
+exports.__sample__ = __fisheryates__;
+
+/* js/src/randfloat.js */
 
 /**
- * Sample using Fisher-Yates method.
+ * Returns a floating point number in interval [i, j[ (i included, j excluded)
+ * according to a uniform distribution.
  */
 
-var sample_t = function(randint){
+var randfloat = function ( i, j ) {
+	return i + Math.random() * (j - i);
+};
 
-	var sample = function(n, a, i, j){
-		var tmp, k, t = i - 1, x = i + n;
+exports.randfloat = randfloat;
 
-		while(++t < x){
-			k    = randint(t, j);
-			tmp  = a[t];
-			a[t] = a[k];
-			a[k] = tmp;
-		}
-	};
+/* js/src/randint.js */
 
-	return sample;
+/**
+ * Returns an integer in interval [i, j[ (i included, j excluded)
+ * according to a uniform distribution.
+ */
 
+var randint = function ( i, j ) {
+	return i + Math.floor( Math.random() * (j - i) );
 };
 
-exports.sample_t = sample_t;
+exports.randint = randint;
+
 /* js/src/shuffle.js */
 
+/**
+ * Shuffle array by sampling the complete array.
+ */
 
-var shuffle_t = function(sample){
+var __shuffle__ = function ( sample ) {
 
-	var shuffle = function(a, i, j){
+	var shuffle = function ( a, i, j ) {
 		sample(j - i, a, i, j);
 	};
 
 	return shuffle;
 };
 
-exports.shuffle_t = shuffle_t;
+exports.__shuffle__ = __shuffle__;
+
 })(typeof exports === 'undefined' ? this['random'] = {} : exports);
diff --git a/js/dist/random.js.map b/js/dist/random.js.map
diff --git a/js/dist/random.min.js b/js/dist/random.min.js
diff --git a/package.json b/package.json
@@ -24,10 +24,12 @@
 	],
 	"version": "0.0.1",
 	"devDependencies": {
-		"aureooms-node-package": "^1.0.0"
+		"aureooms-node-package": "^1.1.3",
+		"aureooms-js-type": "^0.1.0",
+		"aureooms-js-operator": "^0.1.3"
 	},
 	"author": "aureooms",
 	"dependencies": {},
 	"main": "js/dist/random.js",
 	"homepage": "http://aureooms.github.io/js-random/"
-}
+}
diff --git a/test/js/src/randfloat.js b/test/js/src/randfloat.js
@@ -0,0 +1,50 @@
+
+var util, type;
+
+util = require( "util" );
+
+type = require( "aureooms-js-type" );
+
+
+
+test( "randfloat", function () {
+
+	var i, n, r, ri, rj, check;
+
+	n = 5000;
+	ri = -n;
+	rj = n;
+
+	check = function () {
+		ok( r < rj, util.format( "%s < %s", r, rj ) );
+		ok( r >= ri, util.format( "%s >= %s", r, ri ) );
+		ok( type.isfinite(r), util.format( "type.isint(%s)", r ) );
+	};
+
+	for ( i = 0 ; i < n ; ++i ) {
+		r = random.randfloat( ri, rj );
+
+		check();
+
+		++ri;
+	}
+
+	for ( i = 0 ; i < n ; ++i ) {
+		r = random.randfloat( ri, rj );
+
+		check();
+
+		--ri;
+		--rj;
+	}
+
+	for ( i = 0 ; i < n ; ++i ) {
+		r = random.randfloat( ri, rj );
+
+		check();
+
+		++rj;
+	}
+
+
+});
diff --git a/test/js/src/randint.js b/test/js/src/randint.js
@@ -0,0 +1,50 @@
+
+var util, type;
+
+util = require( "util" );
+
+type = require( "aureooms-js-type" );
+
+
+
+test( "randint", function () {
+
+	var i, n, r, ri, rj, check;
+
+	n = 5000;
+	ri = -n;
+	rj = n;
+
+	check = function () {
+		ok( r < rj, util.format( "%s < %s", r, rj ) );
+		ok( r >= ri, util.format( "%s >= %s", r, ri ) );
+		ok( type.isint(r), util.format( "type.isint(%s)", r ) );
+	};
+
+	for ( i = 0 ; i < n ; ++i ) {
+		r = random.randint( ri, rj );
+
+		check();
+
+		++ri;
+	}
+
+	for ( i = 0 ; i < n ; ++i ) {
+		r = random.randint( ri, rj );
+
+		check();
+
+		--ri;
+		--rj;
+	}
+
+	for ( i = 0 ; i < n ; ++i ) {
+		r = random.randint( ri, rj );
+
+		check();
+
+		++rj;
+	}
+
+
+});
diff --git a/test/js/src/sample.js b/test/js/src/sample.js
@@ -0,0 +1,22 @@
+
+var util, operator;
+
+util = require( "util" );
+
+operator = require( "aureooms-js-operator" );
+
+test ( "sample", function () {
+
+	var algorithms;
+
+	algorithms = [
+		random.__fisheryates__( random.randint ),
+		random.__sample__( random.randint )
+	];
+
+	// TODO implement test
+
+	expect(0);
+
+
+});
