Use CSS for tests, gallery and docs

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

index 6a469b8..873e7ca 100644 (file)
--- a/tests/linear-regression.html
+++ b/tests/linear-regression.html
@@ -1,13 +1,14 @@
+<!DOCTYPE html>
  <html>
    <head>
+    <link rel="stylesheet" href="../css/dygraph.css">
      <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="../dist/dygraph.js"></script>
+
      <style type="text/css">
      body { max-width: 640 px; }
      </style>
@@ -55,6 +56,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;
@@ -79,6 +84,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.
  
@@ -96,11 +105,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;