basic flot api support

Author: trevnorris

src/plugin/flot.jstat.js

@@ -1,7 +1,34 @@
 (function( jStat, jQuery ) {
 
-jStat.plot = function( selector, opts ) {
+// 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.plot = 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/js/tests/flot-tests.js

@@ -1,40 +1,47 @@
 $(function() {
 	var betaInst = jStat.beta( 3, 4 );
-	$.plot( '#betadiv', [
-		{
-			data : jStat.seq( 0, 1, 101, function( x ) { return [ x, betaInst.pdf( x )];}),
-			label : 'PDF'
-		},{
-			data : jStat.seq( 0, 1, 101, function( x ) { return [ x, betaInst.cdf( x )];}),
-			label : 'CDF',
-			yaxis : 2
-		}],{
+	j$.plot( '#betadiv', [{
+		data : betaInst.pdf,
+		label : 'PDF'
+	},{
+		data : betaInst.cdf,
+		label : 'CDF',
+		yaxis : 2
+	}],{
+		flotopts : {
 			yaxes : [{}, { position : 'right' }]
+		}
 	});
 
 	var cauchyInst = jStat.cauchy( 3, 4 );
-	$.plot( '#cauchydiv', [
-		{
-			data : jStat.seq( -20, 20, 101, function( x ) { return [ x, cauchyInst.pdf( x )];}),
-			label : 'PDF'
-		},{
-			data : jStat.seq( -20, 20, 101, function( x ) { return [ x, cauchyInst.cdf( x )];}),
-			label : 'CDF',
-			yaxis : 2
-		}],{
+	j$.plot( '#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 );
-	$.plot( '#studenttdiv', [
-		{
-			data : jStat.seq( -6, 6, 101, function( x ) { return [ x, stInst.pdf( x, 4 )];}),
-			label : 'PDF'
-		},{
-			data : jStat.seq( -6, 6, 101, function( x ) { return [ x, stInst.cdf( x, 4 )];}),
-			label : 'CDF',
-			yaxis : 2
-		}],{
+	j$.plot( '#studenttdiv', [{
+		data : stInst.pdf,
+		label : 'PDF'
+	},{
+		data : stInst.cdf,
+		label : 'CDF',
+		yaxis : 2
+	}],{
+		start : -6,
+		stop : 6,
+		flotopts : {
 			yaxes : [{}, { position : 'right' }]
+		}
 	});
 });