Merge branch 'flot'

Author: trevnorris

Makefile

@@ -10,7 +10,8 @@ COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
 
 BASE_FILES = ${SRC_DIR}/core.js\
 	${SRC_DIR}/distribution.js\
-	${SRC_DIR}/special.js
+	${SRC_DIR}/special.js\
+	${SRC_DIR}/plugin/flot.jstat.js
 
 JS = ${DIST_DIR}/jstat.js
 JS_MIN = ${DIST_DIR}/jstat.min.js

src/core.js

@@ -26,8 +26,31 @@ var slice = Array.prototype.slice,
 	// test if object
 	isObject = function( arg ) {
 		return toString.call( arg ) === "[object Object]";
+	},
+
+	// calculate correction for IEEE
+	calcRdx = function( n, m ) {
+		var val = n > m ? n : m;
+		return Math.pow( 10, 15 - ~~( Math.log((( val > 0 ) ? val : -val )) * Math.LOG10E ));
 	};
 
+// implement bind if browser doesn't natively support it
+if ( !Function.prototype.bind ) {
+	Function.prototype.bind = function( obj ) {
+		var slice = [].slice,
+			args = slice.call( arguments, 1 ),
+			self = this,
+			nop = function() {},
+			bound = function() {
+				return self.apply( this instanceof nop ? this : ( obj || {} ),
+					args.concat( slice.call( arguments ))
+				);
+			};
+		bound.prototype = this.prototype;
+		return bound;
+	};
+}
+
 // global function
 function jStat() {
 	return new jStat.fn.init( arguments );
@@ -67,7 +90,7 @@ jStat.fn = jStat.prototype = {
 	},
 
 	// only to be used internally
-	push : Array.prototype.push,
+	push : [].push,
 	sort : [].sort,
 	splice : [].splice
 };
@@ -273,7 +296,7 @@ jStat.extend({
 	// generate sequence
 	seq : function( min, max, length, func ) {
 		var arr = [],
-			hival = 1e15,	// simple fix for IEEE floating point errors
+			hival = calcRdx( min, max ),
 			step = ( max * hival - min * hival ) / (( length - 1 ) * hival ),
 			current = min,
 			cnt = 0;

src/distribution.js

@@ -5,6 +5,8 @@ jStat.beta = function( alpha, beta ) {
 	if (!( this instanceof arguments.callee )) return new jStat.beta( alpha, beta );
 	this.alpha = alpha;
 	this.beta = beta;
+
+	for ( var i in jStat.beta.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend beta function with static methods
@@ -76,6 +78,8 @@ jStat.cauchy = function( local, scale ) {
 	if (!( this instanceof arguments.callee )) return new jStat.cauchy( local, scale );
 	this.local = local;
 	this.scale = scale;
+
+	for ( var i in jStat.cauchy.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend cauchy function with static methods
@@ -144,6 +148,8 @@ jStat.cauchy.prototype.sample = function( arr ) {
 jStat.chisquare = function( dof ) {
 	if (!( this instanceof arguments.callee )) return new jStat.chisquare( dof );
 	this.dof = dof;
+
+	for ( var i in jStat.chisquare.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend chisquare function with static methods
@@ -213,6 +219,8 @@ jStat.chisquare.prototype.sample = function( arr ) {
 jStat.exponential = function( rate ) {
 	if (!( this instanceof arguments.callee )) return new jStat.exponential( rate );
 	this.rate = rate;
+
+	for ( var i in jStat.exponential.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend exponential function with static methods
@@ -282,6 +290,8 @@ jStat.gamma = function( shape, scale ) {
 	if (!( this instanceof arguments.callee )) return new jStat.gamma( shape, scale );
 	this.shape = shape;
 	this.scale = scale;
+
+	for ( var i in jStat.gamma.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend gamma function with static methods
@@ -348,6 +358,8 @@ jStat.kumaraswamy = function( alpha, beta ) {
 	if (!( this instanceof arguments.callee )) return new jStat.kumaraswamy( alpha, beta );
 	this.alpha = alpha;
 	this.beta = beta;
+
+	for ( var i in jStat.kumaraswamy.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend kumaraswamy function with static methods
@@ -399,6 +411,8 @@ jStat.lognormal = function( mu, sigma ) {
 	if (!( this instanceof arguments.callee )) return new jStat.lognormal( mu, sigma );
 	this.mu = mu;
 	this.sigma = sigma;
+
+	for ( var i in jStat.lognormal.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend lognormal function with static methods
@@ -468,6 +482,8 @@ jStat.normal = function( mean, std ) {
 	if (!( this instanceof arguments.callee )) return new jStat.normal( mean, std );
 	this.mean = mean;
 	this.std = std;
+
+	for ( var i in jStat.normal.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend normal function with static methods
@@ -537,6 +553,8 @@ jStat.pareto = function( scale, shape ) {
 	if (!( this instanceof arguments.callee )) return new jStat.pareto( scale, shape );
 	this.scale = scale;
 	this.shape = shape;
+
+	for ( var i in jStat.pareto.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend pareto function with static methods
@@ -588,6 +606,8 @@ jStat.extend( jStat.pareto, {
 jStat.studentt = function( dof ) {
 	if (!( this instanceof arguments.callee )) return new jStat.studentt( dof );
 	this.dof = dof;
+
+	for ( var i in jStat.studentt.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend studentt function with static methods
@@ -660,6 +680,8 @@ jStat.weibull = function( scale, shape ) {
 	if (!( this instanceof arguments.callee )) return new jStat.weibull( scale, shape );
 	this.scale = scale;
 	this.shape = shape;
+
+	for ( var i in jStat.weibull.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend weibull function with static methods
@@ -729,6 +751,8 @@ jStat.uniform = function( a, b ) {
 	if (!( this instanceof arguments.callee )) return new jStat.uniform( a, b );
 	this.a = a;
 	this.b = b;
+
+	for ( var i in jStat.uniform.prototype ) this[i] = this[i].bind( this );
 };
 
 // extend uniform function with static methods

src/plugin/flot.jstat.js

@@ -0,0 +1,34 @@
+(function( jStat, jQuery ) {
+
+// options:
+// - start: beginning of graph
+// - stop: end of graph
+// - step: number of steps in the graph
+// - flotopts : flot specific options
+var defaults = {
+	start : 0,
+	stop : 1,
+	step : 101,
+	flotopts : {}
+};
+
+jStat.flot = function( selector, funcs, opts ) {
+	opts = jQuery.extend( true, {}, defaults, opts );
+
+	var data = [],
+		i = 0;
+
+	if ( jQuery.isFunction( funcs[0] )) {
+		for ( ; i < funcs.length; i++ )
+			data.push( jStat.seq( opts.start, opts.stop, opts.step, function( x ) { return [ x, funcs[i]( x )]; }));
+	} else {
+		for ( ; i < funcs.length; i++ ) {
+			funcs[i].data = jStat.seq( opts.start, opts.stop, opts.step, function( x ) { return [ x, funcs[i].data( x )]; });
+		}
+		data = funcs;
+	}
+
+	return jQuery.plot( selector, data, opts.flotopts);
+};
+
+})( this.jStat, this.jQuery );

test/css/flot.css

@@ -0,0 +1,4 @@
+.graph-example{
+	width: 600px;
+	height: 400px;
+}

test/flot.html

@@ -0,0 +1,24 @@
+<!doctype html>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<title>Flot Tests</title>
+	<link rel="stylesheet" href="css/flot.css" />
+	<script src="js/jquery.min.js"></script>
+	<script src="js/jquery.flot.min.js"></script>
+	<script src="../src/core.js"></script>
+	<script src="../src/special.js"></script>
+	<script src="../src/distribution.js"></script>
+	<script src="../src/plugin/flot.jstat.js"></script>
+	<script src="js/tests/flot-tests.js"></script>
+</head>
+<body>
+	<h1>Basic Examples</h1>
+	<h2>Beta Distriubtion</h2>
+	<div class="graph-example" id="betadiv"></div>
+	<h2>Cauchy Distriubtion</h2>
+	<div class="graph-example" id="cauchydiv"></div>
+	<h2>Student T Distriubtion</h2>
+	<div class="graph-example" id="studenttdiv"></div>
+</body>
+</html>

test/js/jquery.flot.min.js

@@ -0,0 +1,47 @@
+$(function() {
+	var betaInst = jStat.beta( 3, 4 );
+	j$.flot( '#betadiv', [{
+		data : betaInst.pdf,
+		label : 'PDF'
+	},{
+		data : betaInst.cdf,
+		label : 'CDF',
+		yaxis : 2
+	}],{
+		flotopts : {
+			yaxes : [{}, { position : 'right' }]
+		}
+	});
+
+	var cauchyInst = jStat.cauchy( 3, 4 );
+	j$.flot( '#cauchydiv', [{
+		data : cauchyInst.pdf,
+		label : 'PDF'
+	},{
+		data : cauchyInst.cdf,
+		label : 'CDF',
+		yaxis : 2
+	}],{
+		start : -20,
+		stop : 20,
+		flotopts : {
+			yaxes : [{}, { position : 'right' }]
+		}
+	});
+
+	var stInst = jStat.studentt( 4 );
+	j$.flot( '#studenttdiv', [{
+		data : stInst.pdf,
+		label : 'PDF'
+	},{
+		data : stInst.cdf,
+		label : 'CDF',
+		yaxis : 2
+	}],{
+		start : -6,
+		stop : 6,
+		flotopts : {
+			yaxes : [{}, { position : 'right' }]
+		}
+	});
+});