Dygraph.dateString_: shows milliseconds if any. (#774)

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

index 183189d..f5becaf 100644 (file)
--- a/tests/linear-regression-addseries.html
+++ b/tests/linear-regression-addseries.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="../dist/dygraph.js"></script>
+
      <style type="text/css">
      body { max-width: 640 px; }
      </style>
@@ -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;
@@ -80,6 +84,10 @@
          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 = [];
@@ -92,11 +100,11 @@
              // Darken the series by 50% to generate its regression.
              var label = labels[i] + " Regression";
              new_labels.push(label);
-            var c = new RGBColor(orig_colors[i - 1]);
+            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_colors.push(toHex(c));
              new_opts[label] = {
                drawPoints: false,
                strokeWidth: 1.0