X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Flinear-regression.html;h=d7c3700a0308f627dcef764e987778acedf7a4df;hb=bc262c4039fb9fd8e22a520bd83b5a0c646800ec;hp=bed74e0c6c155606a43fd03a998c6432fd9c40e9;hpb=34bbe78bab0cfe4a986802aa2e3dc5edbcc55c35;p=dygraphs.git diff --git a/tests/linear-regression.html b/tests/linear-regression.html index bed74e0..d7c3700 100644 --- a/tests/linear-regression.html +++ b/tests/linear-regression.html @@ -1,13 +1,17 @@ + + Linear Regression - - - - + + + @@ -35,7 +39,8 @@ { labels: ['X', 'Y1', 'Y2'], underlayCallback: drawLines, - drawPoints: true + drawPoints: true, + strokeWidth: 0.0 } ); @@ -54,6 +59,10 @@ var y = g.getValue(i, series); if (y == null) continue; + if (y.length == 2) { + // using fractions + y = y[0] / y[1]; + } num++; sum_x += x; @@ -66,7 +75,7 @@ var b = (sum_y - a * sum_x) / num; coeffs[series] = [b, a]; - if (console) { + if (typeof(console) != 'undefined') { console.log("coeffs(" + series + "): [" + b + ", " + a + "]"); } @@ -95,7 +104,7 @@ 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));