X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Flinear-regression.html;h=d7c3700a0308f627dcef764e987778acedf7a4df;hb=bacf5ce283d6871ce1c090f29bf5411341622248;hp=9f18d589f980d8217854bf068fbb2e5dd8f973ff;hpb=895b3657b0ab22bb35815a1687c71116b2d8b36c;p=dygraphs.git diff --git a/tests/linear-regression.html b/tests/linear-regression.html index 9f18d58..d7c3700 100644 --- a/tests/linear-regression.html +++ b/tests/linear-regression.html @@ -1,13 +1,17 @@ + + Linear Regression - - - - + + + @@ -55,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; @@ -67,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 + "]"); } @@ -96,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));