fractions

[dygraphs.git] / tests / linear-regression.html
diff --git a/tests/linear-regression.html b/tests/linear-regression.html

index 22017d3..93d95d9 100644 (file)
--- a/tests/linear-regression.html
+++ b/tests/linear-regression.html
@@ -2,7 +2,7 @@
    <head>
      <title>Linear Regression</title>
      <!--[if IE]>
-    <script type="text/javascript" src="excanvas.js"></script>
+    <script type="text/javascript" src="../excanvas.js"></script>
      <![endif]-->
      <script type="text/javascript" src="../strftime/strftime-min.js"></script>
      <script type="text/javascript" src="../rgbcolor/rgbcolor.js"></script>
@@ -22,20 +22,23 @@
      <div id="demodiv" style="width: 480px; height: 320px;"></div>
  
      <script type="text/javascript">
-      var data = [];
+      var data = "X,Y1,Y2\n";
        for (var i = 0; i < 120; i++) {
-        data.push([i,
-                   i / 5.0 + 10.0 * Math.sin(i / 3.0),
-                   30.0 - i / 5.0 - 10.0 * Math.sin(i / 3.0 + 1.0)]);
+        // data.push([i,
+        //            i / 5.0 + 10.0 * Math.sin(i / 3.0),
+        //            30.0 - i / 5.0 - 10.0 * Math.sin(i / 3.0 + 1.0)]);
+        data += i + "," + i + "/120," + (i*(120-i)) + "/" + (60*60) + "\n";
        }
  
        g = new Dygraph(
                document.getElementById("demodiv"),
                data,
                {
-                labels: ['X', 'Y1', 'Y2'],
                  underlayCallback: drawLines,
-                drawPoints: true
+                drawPoints: true,
+                strokeWidth: 0.0,
+                fractions: true,
+                errorBars: true
                }
            );
  
@@ -66,7 +69,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 +98,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;