X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Flinear-regression.html;h=b33d4a694de8e97805742b2119d294823c5a19bf;hb=77a1405a7dea7e9de770583598a50e5907e6b1a1;hp=93d95d902fad2109170f40ef684e0f68e0aa1b14;hpb=0a61ee86ca32e3be8c2bb331953bdab6cb869672;p=dygraphs.git

diff --git a/tests/linear-regression.html b/tests/linear-regression.html
index 93d95d9..b33d4a6 100644
--- a/tests/linear-regression.html
+++ b/tests/linear-regression.html
@@ -1,13 +1,13 @@
+<!DOCTYPE html>
 <html>
   <head>
     <title>Linear Regression</title>
-    <!--[if IE]>
-    <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>
-    <script type="text/javascript" src="../dygraph-canvas.js"></script>
-    <script type="text/javascript" src="../dygraph.js"></script>
+    <!--
+    For production (minified) code, use:
+    <script type="text/javascript" src="dygraph-combined.js"></script>
+    -->
+    <script type="text/javascript" src="../dygraph-dev.js"></script>
+
     <style type="text/css">
     body { max-width: 640 px; }
     </style>
@@ -22,23 +22,21 @@
     <div id="demodiv" style="width: 480px; height: 320px;"></div>
 
     <script type="text/javascript">
-      var data = "X,Y1,Y2\n";
+      var data = [];
       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 += i + "," + i + "/120," + (i*(120-i)) + "/" + (60*60) + "\n";
+        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)]);
       }
 
       g = new Dygraph(
               document.getElementById("demodiv"),
               data,
               {
+                labels: ['X', 'Y1', 'Y2'],
                 underlayCallback: drawLines,
                 drawPoints: true,
-                strokeWidth: 0.0,
-                fractions: true,
-                errorBars: true
+                strokeWidth: 0.0
               }
           );
 
@@ -57,6 +55,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;
@@ -81,6 +83,10 @@
         g.updateOptions({});
       }
 
+      function toHex(rgb) {
+        return 'rgb(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ')';
+      }
+
       function drawLines(ctx, area, layout) {
         if (typeof(g) == 'undefined') return;  // won't be set on the initial draw.
 
@@ -98,11 +104,11 @@
           var p1 = g.toDomCoords(x1, y1);
           var p2 = g.toDomCoords(x2, y2);
 
-          var c = new RGBColor(g.getColors()[i - 1]);
+          var c = Dygraph.toRGB_(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();
+          var color = toHex(c);
           ctx.save();
           ctx.strokeStyle = color;
           ctx.lineWidth = 1.0;
