X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Flinear-regression.html;h=95177e3776f1af4bc7af1e5b83fd2f578558762e;hb=44f29e932dcbe83c1bfaebb8735579392e27a5df;hp=22017d397f510032f895235b481e658eb544c417;hpb=05a1d11691a0f5ee3bfe2ff87e3eb8c90059a91c;p=dygraphs.git diff --git a/tests/linear-regression.html b/tests/linear-regression.html index 22017d3..95177e3 100644 --- a/tests/linear-regression.html +++ b/tests/linear-regression.html @@ -1,8 +1,10 @@ + + Linear Regression @@ -35,7 +37,8 @@ { labels: ['X', 'Y1', 'Y2'], underlayCallback: drawLines, - drawPoints: true + drawPoints: true, + strokeWidth: 0.0 } ); @@ -54,6 +57,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 +73,9 @@ var b = (sum_y - a * sum_x) / num; coeffs[series] = [b, a]; - console.log("coeffs(" + series + "): [" + b + ", " + a + "]"); + if (typeof(console) != 'undefined') { + console.log("coeffs(" + series + "): [" + b + ", " + a + "]"); + } g.updateOptions({}); // forces a redraw. } @@ -93,8 +102,11 @@ var p1 = g.toDomCoords(x1, y1); var p2 = g.toDomCoords(x2, y2); - console.log("(" + x1 + ", " + y1 + ") - (" + x2 + ", " + y2 + ")"); - var color = g.getColors()[i - 1]; + var c = new RGBColor(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)); + var color = c.toHex(); ctx.save(); ctx.strokeStyle = color; ctx.lineWidth = 1.0;