Added number of execution to analysis.

analysis.py

@@ -77,39 +77,33 @@ def main():
         s2s /= len(tasks)
         s2s /= len(tasks)
         e2e /= len(tasks)
         e2e /= len(tasks)
         response /= len(tasks)
         response /= len(tasks)
-        misses_avrg /= exec_cnt
 
 
         outkey = round(util, 2)
         outkey = round(util, 2)
 
 
         try:
         try:
-            out[outkey].append((s2s, e2e, misses, response))
+            out[outkey].append((s2s, e2e, misses, response, exec_cnt))
         except KeyError:
         except KeyError:
-            out[outkey] = [(s2s, e2e, misses, response)]
+            out[outkey] = [(s2s, e2e, misses, response, exec_cnt)]
 
 
     with open('analysis/{}_s2s.dat'.format(args.analysis), 'w') as s2sfile:
     with open('analysis/{}_s2s.dat'.format(args.analysis), 'w') as s2sfile:
         for key, value in out.items():
         for key, value in out.items():
             for elem in value:
             for elem in value:
-                print('{}; {}'.format(key, elem[0]), file=s2sfile)
+                print('{}; {}; {}'.format(key, elem[0], elem[4]), file=s2sfile)
 
 
     with open('analysis/{}_e2e.dat'.format(args.analysis), 'w') as e2efile:
     with open('analysis/{}_e2e.dat'.format(args.analysis), 'w') as e2efile:
         for key, value in out.items():
         for key, value in out.items():
             for elem in value:
             for elem in value:
-                print('{}; {}'.format(key, elem[1]), file=e2efile)
+                print('{}; {}'.format(key, elem[1], elem[4]), file=e2efile)
 
 
     with open('analysis/{}_misses.dat'.format(args.analysis), 'w') as missesfile:
     with open('analysis/{}_misses.dat'.format(args.analysis), 'w') as missesfile:
         for key, value in out.items():
         for key, value in out.items():
             for elem in value:
             for elem in value:
-                print('{}; {}'.format(key, elem[2]), file=missesfile)
-
-    with open('analysis/{}_misses_avrg.dat'.format(args.analysis), 'w') as missesavrgfile:
-        for key, value in out.items():
-            for elem in value:
-                print('{}; {}'.format(key, elem[3]), file=missesavrgfile)
+                print('{}; {}'.format(key, elem[2], elem[4]), file=missesfile)
 
 
     with open('analysis/{}_response.dat'.format(args.analysis), 'w') as responsefile:
     with open('analysis/{}_response.dat'.format(args.analysis), 'w') as responsefile:
         for key, value in out.items():
         for key, value in out.items():
             for elem in value:
             for elem in value:
-                print('{}; {}'.format(key, elem[3]), file=responsefile)
+                print('{}; {}'.format(key, elem[3], elem[4]), file=responsefile)
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     main()
     main()