X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=gallery%2Flinear-regression.js;h=11caff2f6a51cf032dc4846aacb18329ee56d87c;hb=406714e12102ee6714774e2801622577ca0daa16;hp=77f69c51ae02d6077963c6a06150aeaadc610d1a;hpb=d53954c3fef58d4ea260ffb35b133a49e86f8d80;p=dygraphs.git
diff --git a/gallery/linear-regression.js b/gallery/linear-regression.js
index 77f69c5..11caff2 100644
--- a/gallery/linear-regression.js
+++ b/gallery/linear-regression.js
@@ -1,21 +1,20 @@
-// Use this as a template for new Gallery entries.
Gallery.register(
'linear-regression',
{
name: 'Linear Regressions',
title: 'Linear Regression Demo',
setup: function(parent) {
- parent.innerHTML =
- "
Click the buttons to generate linear regressions over either data "+
- "series. If you zoom in and then click the regression button, the regression "+
- "will only be run over visible points. Zoom back out to see what the local "+
- "regression looks like over the full data.
"+
- "" +
- "
" +
- " " +
- " " +
- "" +
- "
";
+ parent.innerHTML = [
+ "
Click the buttons to generate linear regressions over either data ",
+ "series. If you zoom in and then click the regression button, the regression ",
+ "will only be run over visible points. Zoom back out to see what the local ",
+ "regression looks like over the full data.
",
+ "",
+ "
",
+ " ",
+ " ",
+ "",
+ "
"].join("\n");
},
run: function() {
document.getElementById("ry1").onclick = function() { regression(1) };
@@ -29,17 +28,6 @@ Gallery.register(
30.0 - i / 5.0 - 10.0 * Math.sin(i / 3.0 + 1.0)]);
}
- g = new Dygraph(
- document.getElementById("demodiv"),
- data,
- {
- labels: ['X', 'Y1', 'Y2'],
- underlayCallback: drawLines,
- drawPoints: true,
- strokeWidth: 0.0
- }
- );
-
// coefficients of regression for each series.
// if coeffs = [ null, [1, 2], null ] then we draw a regression for series 1
// only. The regression line is y = 1 + 2 * x.
@@ -100,7 +88,7 @@ Gallery.register(
var p1 = g.toDomCoords(x1, y1);
var p2 = g.toDomCoords(x2, y2);
- var c = new RGBColor(g.getColors()[i - 1]);
+ var c = new RGBColorParser(g.getColors()[i - 1]);
c.r = Math.floor(255 - 0.5 * (255 - c.r));
c.g = Math.floor(255 - 0.5 * (255 - c.g));
c.b = Math.floor(255 - 0.5 * (255 - c.b));
@@ -116,5 +104,17 @@ Gallery.register(
ctx.restore();
}
}
+
+ g = new Dygraph(
+ document.getElementById("demodiv"),
+ data,
+ {
+ labels: ['X', 'Y1', 'Y2'],
+ underlayCallback: drawLines,
+ drawPoints: true,
+ drawAxesAtZero: true,
+ strokeWidth: 0.0
+ }
+ );
}
});