Changes in / [1afda5a2:d18540f]

Location:

benchmark/convoy

Files:

• data/single_16_thd (deleted)
• genConvoyStats.py (modified) (3 diffs)

benchmark/convoy/genConvoyStats.py

@@ -1 @@
-#!/usr/bin/env python3
-
 import os
 import sys
@@ -17 +15 @@
 parser.add_argument("-o", "--OutputFile", default='', help="File to write output to")
 parser.add_argument("-v", "--Verbose", help="Verbose output. Will print per run stats alongside aggregates", action='count', default=0)
-parser.add_argument("-s", "--Single", help="Indicates that input only contains a single run. Assumes the number of threads is the value passed to -m", action='count', default=0)
 
 args = parser.parse_args()
@@ -188 +185 @@
     expected.append(expectedConvoy)
 
-    if args.Verbose or args.Single:
+    if args.Verbose:
         output('Convoying bounds: {:.2f}%-{:.2f}%, Expected convoying: {:.2f}%'.format(lowerBoundConvoy,upperBoundConvoy, expectedConvoy))
 
 
-if args.Single:
-    output("N: " + str(args.MaxThreads))
-    goToLineByStartingChars(str(args.MaxThreads)+' ')
-    readInMatrix(int(args.MaxThreads))
-    analyzeRun()
-    reset()
-else:
-    for i in range(args.MaxThreads):
-        output("N: " + str(i+1))
-
-        goToLineByStartingChars(str(i+1)+' ')
-        for j in range(args.RunsPerNumThds):
-            readInMatrix(i+1)
-            analyzeRun()
-            reset()
-
-        output('Mean convoying bounds: {:.2f}%-{:.2f}%, Mean expected convoying: {:.2f}%'.format(st.mean(minBound), st.mean(maxBound),st.mean(expected)))
-        output('Median convoying bounds: {:.2f}%-{:.2f}%, Median expected convoying: {:.2f}%'.format(st.median(minBound), st.median(maxBound),st.median(expected)))
-        output('')
-        thdReset()
+for i in range(args.MaxThreads):
+    output("N: " + str(i+1))
+
+    goToLineByStartingChars(str(i+1)+' ')
+    for j in range(args.RunsPerNumThds):
+        readInMatrix(i+1)
+        analyzeRun()
+        reset()
+
+    output('Mean convoying bounds: {:.2f}%-{:.2f}%, Mean expected convoying: {:.2f}%'.format(st.mean(minBound), st.mean(maxBound),st.mean(expected)))
+    output('Median convoying bounds: {:.2f}%-{:.2f}%, Median expected convoying: {:.2f}%'.format(st.median(minBound), st.median(maxBound),st.median(expected)))
+    output('')
+    thdReset()
 
 readFile.close()