Commit 24f7b3c6 authored by Jan Kiene's avatar Jan Kiene
Browse files

fiy (hopefully) last errors in complexity plotting with references

parent 51d529b2

ci/complexity_measurements/genWebpageData.py

+8 −2
Original line number Diff line number Diff line
@@ -426,10 +426,16 @@ def create_display_strings( 
        displays.append(display)



    if which == "wmops_per_op":

        assert len(displays) == 4

        # flot.js' "stack: true" depends on the order of data arrays

        # reorder here instead of reworking above loop

        displays = [displays[0], displays[2], displays[1], displays[3]]

        displays_encs = displays[0].split(", \n")

        displays_decs = displays[1].split(", \n")

        displays = [

            displays_encs[0],

            displays_decs[0],

            displays_encs[1],

            displays_decs[1],

        ]



    return displays

ci/complexity_measurements/index_complexity.html

+5 −25
Original line number Diff line number Diff line
@@ -665,16 +665,6 @@ function WMOPS_perOP() { 


          text += "<b><u>Mode: " + Graphs_WMOPS_perOP.wmops_worstcase_per_op.runs[x].operatingPoint + "</u></b><br>";



          text += 'Score: ' + Math.round(y * 100) / 100;

          if (graph.direction == -1)

            text += " WMOPS";

          if( item.series.id == "worstCaseEnc" ){

            text += " (enc)";

          } 

          if( item.series.id == "worstCaseDec" ){

            text += " (enc + dec)";

          } 

          text += "<br><br>";

          text += "Worst case enc: "   + scoreEnc + " WMOPS<br>";

          text += "Worst case dec: "   + scoreDec + " WMOPS<br>";

          text += "Worst case codec: " + scoreCodec + " WMOPS<br><br>";
@@ -684,17 +674,17 @@ function WMOPS_perOP() { 
        }

        else if (Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays.length == 4) {

          encData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[0];

          decData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[2];

          decData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[1];



          encRefData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[1];

          encRefData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[2];

          decRefData = Graphs_WMOPS_perOP.wmops_worstcase_per_op.displays[3];



          var x = item.datapoint[0];

          var y = item.datapoint[1];



          var run = Graphs_WMOPS_perOP.wmops_worstcase_per_op.runs[x];

          var codec = run.codec;

          var op = run.operatingPoint;

          var codec = op.split(" - ")[1];



          var scoreEnc, scoreDec;
@@ -712,18 +702,8 @@ function WMOPS_perOP() { 


          var scoreCodec = Math.round((scoreEnc + scoreDec) * 100) / 100;



          text += "<b><u>Mode: " + op + " - " + codec + "</u></b><br>";

          text += "<b><u>Mode: " + op + "</u></b><br>";



          text += 'Score: ' + Math.round(y * 100) / 100;

          if (graph.direction == -1)

            text += " WMOPS";

          if( item.series.id == "worstCaseEnc" ){

            text += " (enc)";

          } 

          if( item.series.id == "worstCaseDec" ){

            text += " (enc + dec)";

          } 

          text += "<br><br>";

          text += "Worst case enc: "   + scoreEnc + " WMOPS<br>";

          text += "Worst case dec: "   + scoreDec + " WMOPS<br>";

          text += "Worst case codec: " + scoreCodec + " WMOPS<br><br>";