Changes between Version 23 and Version 24 of sandbox


Ignore:
Timestamp:
Nov 5, 2013, 11:12:00 AM (10 years ago)
Author:
murphpo
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • sandbox

    v23 v24  
    1010<script type="text/javascript">
    1111(function () {
    12         var container = document.getElementById('xput_chart');
     12        var container = document.getElementById('container_bar1');
    1313        var i;
    1414
    15         //Empty array per data series
    16         var data1 = [];
    17         var data2 = [];
    18         var data3 = [];
    19         var data4 = [];
    20         var data5 = [];
    21         var data6 = [];
    22         var data7 = [];
    23         var data8 = [];
    24 
    25         //Common X values
    26         var d_x = [32,83,133,184,234,285,336,386,437,488,538,589,639,690,741,791,842,893,943,994,1044,1095,1146,1196,1247,1298,1348,1399,1449,1500];
    27 
    28         //Separate Y values
    29         var xput_6 = [6.5715e+05,1.3121e+06,1.7282e+06,2.0321e+06,2.2394e+06,2.4111e+06,2.5412e+06,2.6541e+06,2.7479e+06,2.8197e+06,2.8815e+06,2.9409e+06,2.9867e+06,3.0118e+06,3.0574e+06,3.1015e+06,3.1306e+06,3.1612e+06,3.1855e+06,3.2146e+06,3.2333e+06,3.2489e+06,3.2615e+06,3.2806e+06,3.2996e+06,3.3125e+06,3.3255e+06,3.338e+06,3.3501e+06,3.351e+06];
    30         var xput_9 = [6.9382e+05,1.5111e+06,2.0603e+06,2.5057e+06,2.8302e+06,3.1068e+06,3.3214e+06,3.501e+06,3.6686e+06,3.8147e+06,3.9037e+06,4.017e+06,4.1107e+06,4.1883e+06,4.2519e+06,4.3149e+06,4.3725e+06,4.4382e+06,4.4651e+06,4.5277e+06,4.5633e+06,4.6001e+06,4.6264e+06,4.6536e+06,4.695e+06,4.7221e+06,4.7463e+06,4.7832e+06,4.8107e+06,4.8195e+06];
    31         var xput_12 = [7.6368e+05,1.7139e+06,2.3875e+06,2.9604e+06,3.3666e+06,3.7506e+06,4.029e+06,4.2939e+06,4.5251e+06,4.7082e+06,4.8856e+06,5.0183e+06,5.1535e+06,5.2592e+06,5.376e+06,5.4793e+06,5.5479e+06,5.6598e+06,5.7033e+06,5.7900e+06,5.8245e+06,5.9031e+06,5.9432e+06,5.9884e+06,6.0554e+06,6.0591e+06,6.1428e+06,6.164e+06,6.209e+06,6.219e+06];
    32         var xput_18 = [7.9408e+05,1.8698e+06,2.702e+06,3.3961e+06,4.0241e+06,4.5081e+06,4.9358e+06,5.3642e+06,5.6836e+06,6.0248e+06,6.2763e+06,6.4931e+06,6.7402e+06,6.9359e+06,7.078e+06,7.263e+06,7.2606e+06,7.5985e+06,7.7024e+06,7.8109e+06,7.9595e+06,8.045e+06,8.14e+06,8.238e+06,8.3125e+06,8.4253e+06,8.4991e+06,8.5423e+06,8.6418e+06,8.6925e+06];
    33         var xput_24 = [8.2608e+05,1.9802e+06,2.9441e+06,3.7996e+06,4.4404e+06,5.1192e+06,5.6875e+06,6.2119e+06,6.6769e+06,7.0082e+06,7.3921e+06,7.7306e+06,8.0744e+06,8.2897e+06,8.5319e+06,8.7928e+06,9.0347e+06,9.2568e+06,9.3819e+06,9.5742e+06,9.7718e+06,9.9492e+06,1.0022e+07,1.0183e+07,1.0343e+07,1.0488e+07,1.0602e+07,1.067e+07,1.0773e+07,1.0908e+07];
    34         var xput_36 = [8.455e+05,2.0923e+06,3.171e+06,4.1553e+06,5.0057e+06,5.7906e+06,6.4982e+06,7.2236e+06,7.8227e+06,8.3985e+06,8.8748e+06,9.3109e+06,9.8853e+06,1.0262e+07,1.0624e+07,1.0966e+07,1.1272e+07,1.1755e+07,1.2038e+07,1.2248e+07,1.2518e+07,1.2759e+07,1.2992e+07,1.3323e+07,1.3552e+07,1.3728e+07,1.3888e+07,1.4073e+07,1.4309e+07,1.4482e+07];
    35         var xput_48 = [8.6528e+05,2.1402e+06,3.3069e+06,4.3899e+06,5.2622e+06,6.2033e+06,7.0745e+06,7.8582e+06,8.6181e+06,9.2866e+06,9.9584e+06,1.0544e+07,1.1127e+07,1.1491e+07,1.2043e+07,1.2518e+07,1.3053e+07,1.3453e+07,1.388e+07,1.4289e+07,1.4686e+07,1.5047e+07,1.5256e+07,1.5517e+07,1.5851e+07,1.6219e+07,1.649e+07,1.6792e+07,1.7034e+07,1.7355e+07];
    36         var xput_54 = [8.6179e+05,2.144e+06,3.3053e+06,4.3849e+06,5.4747e+06,6.4282e+06,7.2999e+06,8.1295e+06,8.882e+06,9.6209e+06,1.0251e+07,1.091e+07,1.1608e+07,1.2185e+07,1.2724e+07,1.3182e+07,1.3741e+07,1.4175e+07,1.4576e+07,1.5028e+07,1.5537e+07,1.591e+07,1.6311e+07,1.6616e+07,1.6929e+07,1.7223e+07,1.7533e+07,1.7841e+07,1.8292e+07,1.8524e+07];
    37        
    38         for(i=0; i<d_x.length; i++) {
    39                 data1.push([d_x[i], 1e-6*xput_6[i]]);
    40                 data2.push([d_x[i], 1e-6*xput_9[i]]);
    41                 data3.push([d_x[i], 1e-6*xput_12[i]]);
    42                 data4.push([d_x[i], 1e-6*xput_18[i]]);
    43                 data5.push([d_x[i], 1e-6*xput_24[i]]);
    44                 data6.push([d_x[i], 1e-6*xput_36[i]]);
    45                 data7.push([d_x[i], 1e-6*xput_48[i]]);
    46                 data8.push([d_x[i], 1e-6*xput_54[i]]);
    47         }
    48        
     15        //Put data here:
     16        var xput_6 = {label:"6 Mbps", data:[[32, 0.657], [83, 1.312], [133, 1.728], [184, 2.032], [234, 2.239], [285, 2.411], [336, 2.541], [386, 2.654], [437, 2.748], [488, 2.820], [538, 2.881], [589, 2.941], [639, 2.987], [690, 3.012], [741, 3.057], [791, 3.101], [842, 3.131], [893, 3.161], [943, 3.185], [994, 3.215], [1044, 3.233], [1095, 3.249], [1146, 3.261], [1196, 3.281], [1247, 3.300], [1298, 3.312], [1348, 3.325], [1399, 3.338], [1449, 3.350], [1500, 3.351]]};
     17        var xput_9 = {label:"9 Mbps", data:[[32, 0.694], [83, 1.511], [133, 2.060], [184, 2.506], [234, 2.830], [285, 3.107], [336, 3.321], [386, 3.501], [437, 3.669], [488, 3.815], [538, 3.904], [589, 4.017], [639, 4.111], [690, 4.188], [741, 4.252], [791, 4.315], [842, 4.372], [893, 4.438], [943, 4.465], [994, 4.528], [1044, 4.563], [1095, 4.600], [1146, 4.626], [1196, 4.654], [1247, 4.695], [1298, 4.722], [1348, 4.746], [1399, 4.783], [1449, 4.811], [1500, 4.819]]};
     18        var xput_12 = {label:"12 Mbps", data:[[32, 0.764], [83, 1.714], [133, 2.387], [184, 2.960], [234, 3.367], [285, 3.751], [336, 4.029], [386, 4.294], [437, 4.525], [488, 4.708], [538, 4.886], [589, 5.018], [639, 5.154], [690, 5.259], [741, 5.376], [791, 5.479], [842, 5.548], [893, 5.660], [943, 5.703], [994, 5.790], [1044, 5.824], [1095, 5.903], [1146, 5.943], [1196, 5.988], [1247, 6.055], [1298, 6.059], [1348, 6.143], [1399, 6.164], [1449, 6.209], [1500, 6.219]]};
     19        var xput_18 = {label:"18 Mbps", data:[[32, 0.794], [83, 1.870], [133, 2.702], [184, 3.396], [234, 4.024], [285, 4.508], [336, 4.936], [386, 5.364], [437, 5.684], [488, 6.025], [538, 6.276], [589, 6.493], [639, 6.740], [690, 6.936], [741, 7.078], [791, 7.263], [842, 7.261], [893, 7.598], [943, 7.702], [994, 7.811], [1044, 7.959], [1095, 8.045], [1146, 8.140], [1196, 8.238], [1247, 8.312], [1298, 8.425], [1348, 8.499], [1399, 8.542], [1449, 8.642], [1500, 8.692]]};
     20        var xput_24 = {label:"24 Mbps", data:[[32, 0.826], [83, 1.980], [133, 2.944], [184, 3.800], [234, 4.440], [285, 5.119], [336, 5.688], [386, 6.212], [437, 6.677], [488, 7.008], [538, 7.392], [589, 7.731], [639, 8.074], [690, 8.290], [741, 8.532], [791, 8.793], [842, 9.035], [893, 9.257], [943, 9.382], [994, 9.574], [1044, 9.772], [1095, 9.949], [1146, 10.022], [1196, 10.183], [1247, 10.343], [1298, 10.488], [1348, 10.602], [1399, 10.670], [1449, 10.773], [1500, 10.908]]};
     21        var xput_36 = {label:"36 Mbps", data:[[32, 0.845], [83, 2.092], [133, 3.171], [184, 4.155], [234, 5.006], [285, 5.791], [336, 6.498], [386, 7.224], [437, 7.823], [488, 8.399], [538, 8.875], [589, 9.311], [639, 9.885], [690, 10.262], [741, 10.624], [791, 10.966], [842, 11.272], [893, 11.755], [943, 12.038], [994, 12.248], [1044, 12.518], [1095, 12.759], [1146, 12.992], [1196, 13.323], [1247, 13.552], [1298, 13.728], [1348, 13.888], [1399, 14.073], [1449, 14.309], [1500, 14.482]]};
     22        var xput_48 = {label:"48 Mbps", data:[[32, 0.865], [83, 2.140], [133, 3.307], [184, 4.390], [234, 5.262], [285, 6.203], [336, 7.074], [386, 7.858], [437, 8.618], [488, 9.287], [538, 9.958], [589, 10.544], [639, 11.127], [690, 11.491], [741, 12.043], [791, 12.518], [842, 13.053], [893, 13.453], [943, 13.880], [994, 14.289], [1044, 14.686], [1095, 15.047], [1146, 15.256], [1196, 15.517], [1247, 15.851], [1298, 16.219], [1348, 16.490], [1399, 16.792], [1449, 17.034], [1500, 17.355]]};
     23        var xput_54 = {label:"54 Mbps", data:[[32, 0.862], [83, 2.144], [133, 3.305], [184, 4.385], [234, 5.475], [285, 6.428], [336, 7.300], [386, 8.130], [437, 8.882], [488, 9.621], [538, 10.251], [589, 10.910], [639, 11.608], [690, 12.185], [741, 12.724], [791, 13.182], [842, 13.741], [893, 14.175], [943, 14.576], [994, 15.028], [1044, 15.537], [1095, 15.910], [1146, 16.311], [1196, 16.616], [1247, 16.929], [1298, 17.223], [1348, 17.533], [1399, 17.841], [1449, 18.292], [1500, 18.524]]};
    4924
    5025        // Draw Graph
    5126        Flotr.draw(container, [
    52                 {data:data1, label:'6 Mbps', lines: {show: true}, points: {show:true}},
    53                 {data:data2, label:'9 Mbps', lines: {show: true}, points: {show:true}},
    54                 {data:data3, label:'12 Mbps', lines: {show: true}, points: {show:true}},
    55                 {data:data4, label:'18 Mbps', lines: {show: true}, points: {show:true}},
    56                 {data:data5, label:'24 Mbps', lines: {show: true}, points: {show:true}},
    57                 {data:data6, label:'36 Mbps', lines: {show: true}, points: {show:true}},
    58                 {data:data7, label:'48 Mbps', lines: {show: true}, points: {show:true}},
    59                 {data:data8, label:'54 Mbps', lines: {show: true}, points: {show:true}},
     27                xput_6,
     28                xput_9,
     29                xput_12,
     30                xput_18,
     31                xput_24,
     32                xput_36,
     33                xput_48,
     34                xput_54,
    6035        ],
    6136        {
    62                 bars : {
    63                         show : false,
    64                         barWidth: 0.5
     37                points: {
     38                        show: true,
     39                },
     40                lines: {
     41                        show: true,
    6542                },
    6643                mouse : {