Commit b2fc59d1 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Correct indices in newsletter parsers

parent 39e42296

ci/complexity_measurements/getWmops.sh

+3 −5
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ tcsh ${scriptDir}/genWebpageData_Ram.csh ${destDir}/wmops/log_ram_all.txt ${dest 
${scriptDir}/mergeNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameFlc}_TROM.csv > ${wmopsFilenameFlc}_ROM.csv

${scriptDir}/parseNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameFlc}_TROM.csv ${wmopsFilenameFlcLast}_ROM.csv ${commit_sha} ${shortDate} ${fullDate} >> ${destDir}/wmops/log_rom_all.txt



cat ${destDir}/wmops/log_rom_all.txt



# generate java script from database

tcsh ${scriptDir}/genWebpageData_Rom.csh ${destDir}/wmops/log_rom_all.txt ${destDir}/wmops/graphs_rom_flc.js Graphs_ROM

ci/complexity_measurements/mergeNewsletterRam.py

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ print("conf;HEAP enc;HEAP dec;HEAP total;STACK enc;STACK dec;STACK max;total") 


for key in ram_table:

    ram = ram_table[key]

    total = int(ram[1]) + int(ram[2]) + int(ram[5])

    total = int(ram[0]) + int(ram[1]) + int(ram[5])

    print(

        key,

        ";",

ci/complexity_measurements/mergeNewsletterRom.py

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ with open(newsletterFilenameTROM, "r") as csvfile: 
        rom_table[key] += lst



# now we have the following format

# PROM enc, PROM dec, PROM total, TROM enc, TROM dec, TROM total

# PROM enc, PROM dec, PROM com, PROM rend, PROM total, TROM enc, TROM dec, TROM com, TROM rend, TROM total



print("conf;PROM enc;PROM dec;PROM com;PROM rend;PROM total;TROM enc;TROM dec;TROM com;TROM rend;TROM total;total")

ci/complexity_measurements/parseNewsletterRam.py

+11 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ with open(newsletterFilenameSTACK, "r") as csvfile: 
        ram_table[key] += lst



# now we have the following format

# HEAP enc, HEAP dec, HEAP total, STACK enc, STACK dec, STACK max(enc, dec)

# HEAP enc, HEAP dec, HEAP total, STACK enc, STACK dec, STACK max(enc, dec), total



for key in ram_table:

    ram = ram_table[key]
@@ -125,11 +125,11 @@ for key in ram_table: 
        max_total_enc[0] = re.sub(" ", "_", key)

        max_total_enc[1] = total_enc



    if total_dec > max_heap_dec[1]:

    if total_dec > max_total_dec[1]:

        max_total_dec[0] = re.sub(" ", "_", key)

        max_total_dec[1] = total_dec



    if total_encdec > max_heap_encdec[1]:

    if total_encdec > max_total_encdec[1]:

        max_total_encdec[0] = re.sub(" ", "_", key)

        max_total_encdec[1] = total_encdec
@@ -137,20 +137,27 @@ print( 
    revision,

    shortDate,

    fullDate,

    

    max_total_encdec[1],

    

    max_total_enc[0],

    max_total_enc[1],

    max_total_dec[0],

    max_total_dec[1],

    

    max_stack_encdec[1],

    max_stack_encdec[0],

    max_stack_enc[0],

    max_stack_enc[1],

    max_stack_dec[0],

    max_stack_dec[1],

    max_heap_enc[1] + max_heap_dec[1],

    

    max_heap_encdec[1],

    max_heap_encdec[0],

    max_heap_enc[0],

    max_heap_enc[1],

    max_heap_dec[0],

    max_heap_dec[1],

    

    newsletterFilenameLast,

)

ci/complexity_measurements/parseNewsletterRom.py

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ for key in rom_table: 
    trom_rend = int(rom[8])

    trom_total = int(rom[9])



    total_encdec = int(rom[10])

    total_encdec = prom_total + trom_total

    

    if prom_enc > max_prom_enc[1]:

        max_prom_enc[0] = re.sub(" ", "_", key)