X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Flinear-regression-addseries.html;h=f5becaf1348a7ced2ff2f6dbfcd237a5d42b1758;hb=c4c10db644336a08b581e2efdb3ad75b950c905c;hp=530cea319de90e207db94a5f8b5b37ae1b93c465;hpb=de0445fc1b969ab85a3d985dbd1e6747f3ddac0b;p=dygraphs.git
diff --git a/tests/linear-regression-addseries.html b/tests/linear-regression-addseries.html
index 530cea3..f5becaf 100644
--- a/tests/linear-regression-addseries.html
+++ b/tests/linear-regression-addseries.html
@@ -1,13 +1,13 @@
+
Linear Regression
-
-
-
-
-
+
+
+
@@ -61,6 +61,10 @@
var y = data[i][series];
if (y == null) continue;
+ if (y.length == 2) {
+ // using fractions
+ y = y[0] / y[1];
+ }
num++;
sum_x += x;
@@ -73,13 +77,17 @@
var b = (sum_y - a * sum_x) / num;
coeffs[series] = [b, a];
- if (console) {
+ if (typeof(console) != 'undefined') {
console.log("coeffs(" + series + "): [" + b + ", " + a + "]");
}
updateChart();
}
+ function toHex(rgb) {
+ return 'rgb(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ')';
+ }
+
function updateChart() {
// Generate a new data set with the regression lines.
var new_labels = [];
@@ -88,16 +96,16 @@
for (var i = 0; i < labels.length; i++) {
new_labels.push(labels[i]);
if (i) new_colors.push(orig_colors[i - 1]);
- new_opts[new_colors.length] = null;
if (coeffs[i]) {
// Darken the series by 50% to generate its regression.
- new_labels.push(labels[i] + " Regression");
- var c = new RGBColor(orig_colors[i - 1]);
+ var label = labels[i] + " Regression";
+ new_labels.push(label);
+ var c = Dygraph.toRGB_(orig_colors[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));
- new_colors.push(c.toHex());
- new_opts[new_colors.length] = {
+ new_colors.push(toHex(c));
+ new_opts[label] = {
drawPoints: false,
strokeWidth: 1.0
};