X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Fdygraph-many-points-benchmark.html;h=17dadcd5c9140da6eee6877c698f6981fc98fb0e;hb=400a62b3df5b199814df17d57423f8c789d132de;hp=7aadb191bfc2f2b67f689b1d5fd5d3ac2257830f;hpb=866ceb258a016484e30d2c7f96cb6cbb9ff05c8c;p=dygraphs.git

diff --git a/tests/dygraph-many-points-benchmark.html b/tests/dygraph-many-points-benchmark.html
index 7aadb19..17dadcd 100644
--- a/tests/dygraph-many-points-benchmark.html
+++ b/tests/dygraph-many-points-benchmark.html
@@ -19,16 +19,21 @@
     <div id='parameters'>
       <p>Data to plot:
         <input type="radio" id="sine" name="group1" value="sine"
-          onclick="clickedRadioButton(this);" checked> sinusoid function
+          onclick="setDataType(this);" checked> sinusoid function
         <input type="radio" id="rand" name="group1" value="rand"
-          onclick="clickedRadioButton(this);"> random points <br></p>
-      <p>Number of points:
+          onclick="setDataType(this);"> random points <br></p>
+      <p>Timestamps:
+        <input type="radio" id="aligned" name="timestamps" value="aligned"
+          onclick="setTimestampType(this);" checked> aligned
+        <input type="radio" id="unaligned" name="timestamps" value="unaligned"
+          onclick="setTimestampType(this);"> unaligned</p>
+      <p>Number of points per series (points):
          <input type="text" id="points" size="20"></p>
-      <p>Number of series:
+      <p>Number of series (series):
          <input type="text" id="series" size="20"></p>
-      <p>Roll period (in points):
+      <p>Roll period (in points, rollPeriod):
         <input type="text" id="rollPeriod" size="20"></p>
-      <p>Repetitions:
+      <p>Repetitions (repititions):
         <input type="text" id="repetitions" size="20"></p>
       <input type="button" value="Go!" onclick="updatePlot();">
     </div>
@@ -43,6 +48,7 @@
       var graph = null;
       var metrics = null;
       var dataType = "sine";
+      var timestamps = "aligned";
 
       var durations = [];
       updatePlot = function() {
@@ -61,6 +67,7 @@
         var xmax = 2.0 * Math.PI;
         var adj = .5;
         var delta = (xmax - xmin) / (numPoints - 1);
+        var unalignmentDelta = delta / numSeries;
 
         for (var i = 0; i < numPoints; ++i) {
           var x = xmin + delta * i;
@@ -74,7 +81,15 @@
             }
             elem.push(y);
           }
-          data[i] = elem;
+          if (timestamps == "aligned") {
+            data[i] = elem;
+          } else {
+            for (var j = 0; j < numSeries; j++) {
+              var elemCopy = elem.slice(0);
+              elemCopy[0] += unalignmentDelta * j;
+              data[i*numSeries + j] = elemCopy;
+            }
+          }
         }
         var labels = [ "x" ];
         for (var j = 0; j < numSeries; j++) {
@@ -124,18 +139,23 @@
           document.getElementById("metaperformance").innerHTML =
               "completed in " + (end2 - start2) + " milliseconds.";
         }
+
+        return millisecondss;
       };
       
-      clickedRadioButton = function(radiobutton) {
+      setDataType = function(radiobutton) {
         dataType = radiobutton.value;
       };
+      setTimestampType = function(radiobutton) {
+        timestamps = radiobutton.value;
+      };
 
       var values = {
         points: 100,
         series: 1,
         rollPeriod: 1,
         repetitions: 1,
-        type: 'sine',
+        type: 'sine'
       };
 
       // Parse the URL for parameters. Use it to override the values hash.