X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Flinear-regression.html;h=6ccc94e4564558afe306877096797a7b316fd9c3;hb=c5a3744991be4af378d64dac5730119ddb2f2d82;hp=e3636c12543f5691f80affa948e6bae158e4cba7;hpb=2a07b0ad9869c9116c06fe1c9084da7fec0923bd;p=dygraphs.git

diff --git a/tests/linear-regression.html b/tests/linear-regression.html
index e3636c1..6ccc94e 100644
--- 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
               }
           );
 
@@ -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,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 + "]");
         }
 
@@ -92,10 +99,18 @@
           var x2 = range[1];
           var y2 = a * x2 + b;
 
+          // Scale up to percentages, rather than fractions.
+          y1 *= 100;
+          y2 *= 100;
+
           var p1 = g.toDomCoords(x1, y1);
           var p2 = g.toDomCoords(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;
