X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Fdygraph-many-points-benchmark.html;h=e092da913bc6f46c2ffc27c069c950d0c9e51fff;hb=916a000e22d330b5f8690af07f561da1bdf7f8e3;hp=c2f83f15e8ca2f6d5ea32438c1d4027587c04718;hpb=f7adb3d7b6a7a95cc4fad2aae1d58397c03902db;p=dygraphs.git

diff --git a/tests/dygraph-many-points-benchmark.html b/tests/dygraph-many-points-benchmark.html
index c2f83f1..e092da9 100644
--- a/tests/dygraph-many-points-benchmark.html
+++ b/tests/dygraph-many-points-benchmark.html
@@ -15,26 +15,26 @@
     <p>Plot which can be easily generated with different numbers of points for
        benchmarking/profiling and improving performance of dygraphs.</p>    
     <p>Number of points:
-       <input type="text" id="num_points_input" size="20"
-              onchange="updatePlot();"></p>
+       <input type="text" id="num_points_input" size="20"></p>
     <p>Number of series:
-       <input type="text" id="num_series_input" size="20"
-              onchange="updatePlot();"></p>
+       <input type="text" id="num_series_input" size="20"></p>
     <p>Roll period (in points):
-      <input type="text" id="roll_period_input" size="20"
-              onchange="updatePlot();"></p>
+      <input type="text" id="roll_period_input" size="20"></p>
     <p>Repetitions:
-      <input type="text" id="repetitions" size="20"
-              onchange="updatePlot();"></p>
+      <input type="text" id="repetitions" size="20"></p>
+
+    <input type="button" value="Go!" onclick="updatePlot();">
     <br>
     <br>
     <div id="plot"></div>
     <div id="message"></div>
     <div id="metrics"></div>
+    <div id="metaperformance"></div>
 
     <script type="text/javascript">
       var plot;
 
+      var durations = [];
       updatePlot = function() {
         document.getElementById('message').innerHTML = "";
         var plotDiv = document.getElementById('plot');
@@ -68,37 +68,41 @@
         var rollPeriod = parseInt(
             document.getElementById('roll_period_input').value);
         var opts = {labels: labels, rollPeriod: rollPeriod};
-        var durations = [];
+        var millisecondss = [];
         for (var i = 0; i < repetitions; i++) {
           var start = new Date();
           plot = new Dygraph(plotDiv, data, opts);
           var end = new Date();
-          durations.push(end - start);
+          durations.push([start, end - start]);
+          millisecondss.push(end - start);
         }
         if (repetitions == 1) {
           document.getElementById('message').innerHTML =
               "completed in " + (end - start) + " milliseconds.";
         } else {
           document.getElementById('message').innerHTML =
-              "Durations: " + durations;
+              "Durations: " + millisecondss;
         }
-        updateMetrics(durations);
-      };
 
-      updateMetrics = function(data) {
-        var d = "run,ms\n";
-        for (var i = 0; i < data.length; i++) {
-          d = d + i + "," + data[i] + "\n";
+        if (durations.length > 0) {
+          var start2 = new Date();
+          new Dygraph(
+              document.getElementById('metrics'),
+              durations,
+              {
+                highlightCircleSize: 4,
+                labels: [ "Date", "ms" ]
+                });
+          var end2 = new Date();
+          document.getElementById("metaperformance").innerHTML =
+              "completed in " + (end2 - start2) + " milliseconds.";
         }
-        var g = new Dygraph(document.getElementById('metrics'), d,
-            {highlightCircleSize: 4});
-      }
+      };
 
       document.getElementById('num_points_input').value = '100';
       document.getElementById('num_series_input').value = '1';
       document.getElementById('roll_period_input').value = '1';
       document.getElementById('repetitions').value = '1';
-      updatePlot();
     </script>
   </body>
 </html>