Commit 7dc55586 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ci/fix-mem-numbers-in-complexity-measurements' into 'main' 

[CI] fix mem number display in compelxity graph and popups

See merge request !2035
parents 03f25119 6b0c4d01

ci/complexity_measurements/index_complexity.html

+13 −20
Original line number Diff line number Diff line
@@ -561,18 +561,17 @@ function WMOPS_perOP() { 


}



  function memTickFormatter(v, axis) {

    var decimals = axis.tickDecimals;

    var str_val = "";

    if (v > 1000000) {

      str_val = (v / 1000000).toFixed(decimals) + " MB";

    }

    else if (v > 1000) {

      str_val = (v / 1000).toFixed(decimals) + " kB";

    }

    else {

      str_val = v.toFixed(decimals) + " B";

    }

  function memTickFormatter(val_bytes, axis) {

    if (val_bytes == 0) return '0 B';



    const decimals = 2;

    const step = 1000;

    const unit = ['B', 'KB', 'MB'];



    var idx = Math.floor(Math.log(val_bytes) / Math.log(step));

    var val_decimal = (val_bytes / Math.pow(step, idx)).toFixed(decimals);

    var str_val = val_decimal + " " + unit[idx];



    return str_val;

  }
@@ -629,10 +628,7 @@ function RAM() { 
              var x = item.datapoint[0];

              var y = item.datapoint[1];

              var text = "<u><b>" + item.series.id + "</b></u><br>"

              text += 'Score: ' + y;



              text += " bytes";

              text += "<br>";

              text += 'Score: ' + memTickFormatter(y) + " (" + y + " B)" + "<br>";

            

              if (x > 0) {

                var thisValue = parseFloat(y);
@@ -769,10 +765,7 @@ function ROM() { 
              var x = item.datapoint[0];

              var y = item.datapoint[1];

              var text = "<u><b>" + item.series.id + "</b></u><br>"

              text += 'Score: ' + y;



              text += " bytes";

              text += "<br>";

              text += 'Score: ' + memTickFormatter(y) + " (" + y + " B)" + "<br>";

            

              if (x > 0) {

                var thisValue = parseFloat(y);