plots updates

Author: AYadrov

infra/cnt_per_iters_plot.py

@@ -22,8 +22,8 @@ def plot_cnt_per_iters(outcomes, args):
     rival = rival.drop(['baseline_precision'], axis=1)
     rival = rival.groupby(['rival_iter'], as_index=False, sort=True).sum()
 
-    ax.bar(np.arange(len(baseline)) + 0.9, baseline['number_of_points'], color="green", alpha=1, width=0.4, label='baseline', hatch='/')
-    ax.bar(np.arange(len(rival)) + 1.1, rival['number_of_points'], color="red", alpha=0.7, width=0.4, label='reval')
+    ax.bar(np.arange(len(baseline)) + 0.925, baseline['number_of_points'], color="green", alpha=1, width=0.5, label='baseline', hatch='/')
+    ax.bar(np.arange(len(rival)) + 1.075, rival['number_of_points'], color="red", alpha=0.7, width=0.5, label='reval')
 
     ax.legend()
     ax.set_xlabel("Iteration")

infra/histograms.py

@@ -43,13 +43,16 @@ def plot_histogram(args, valid=True):
     ax.margins(x=0.02)
     ax.set_ylabel("Seconds spent")
     ax.set_xlabel("Precision (number of bits)")
-    ax.set_title("Histogram for valid points" if valid else "Histogram for all the points")
-
+    
     plt.legend()
     plt.tight_layout()
-    plt.savefig(args.path + "/histogram_valid.png" if valid else args.path + "/histogram_all.png", format="png")
     plt.savefig(args.path + "/histogram_valid.pdf" if valid else args.path + "/histogram_all.pdf", format="pdf")
 
+    ax.set_title("Histogram for valid points" if valid else "Histogram for all the points")
+    plt.tight_layout()
+    plt.savefig(args.path + "/histogram_valid.png" if valid else args.path + "/histogram_all.png", format="png")
+    
+
 
 def bucket_precisions_by_bins(data, bins):
     x = [0] * len(bins)

infra/ratio_plot.py

@@ -90,6 +90,7 @@ def tool_cmp2speed(x):
     ax.set_xticklabels(["$2^{" + str(i+7) + "}$" for i, x in enumerate(x)])
 
     ax.yaxis.grid(True, linestyle='-', which='major', color='grey', alpha=0.3)
+    plt.tight_layout()
     plt.savefig(args.path + "/ratio_plot_precision.png", format="png")
     plt.savefig(args.path + "/ratio_plot_precision.pdf", format="pdf")
 

infra/repeats_plot.py

@@ -11,14 +11,16 @@ def plot_repeats_plot(outcomes, args):
 
     # Drop precision column and sum up based on iteration
     rival = (outcomes.loc[(outcomes['tool'] == "rival") & (outcomes['iter'] > 0)]).sort_values(by=['iter'])
+    rival_no_repeats = (outcomes.loc[(outcomes['tool'] == "rival-no-repeats") & (outcomes['iter'] > 0)]).sort_values(by=['iter'])
     baseline = (outcomes.loc[(outcomes['tool'] == "baseline") & (outcomes['iter'] > 0)]).sort_values(by=['iter'])
 
-    ax.bar(np.arange(len(baseline)) + 0.9, baseline['number_of_instr_executions'], color="green", alpha=1, width=0.4, label='baseline', hatch='/')
-    ax.bar(np.arange(len(rival)) + 1.1, rival['number_of_instr_executions'], color="red", alpha=0.7, width=0.4, label='reval')
+    ax.bar(np.arange(len(baseline)) + 0.925, 100, color="green", alpha=0.6, width=0.5, label='baseline', hatch='/')
+    percentages = np.array(rival['number_of_instr_executions']) / np.array(rival_no_repeats['number_of_instr_executions']) * 100
+    ax.bar(np.arange(len(rival)) + 1.075, percentages, color="red", alpha=1, width=0.5, label='reval')
 
     ax.legend()
     ax.set_xlabel("Iteration")
-    ax.set_ylabel("Number of instruction executions")
+    ax.set_ylabel("Percentage of instructions executed")
     ax.yaxis.grid(True, linestyle='-', which='major', color='grey', alpha=0.3)
     plt.tight_layout()
     plt.savefig(args.path + "/repeats_plot.png", format="png")

time.rkt

@@ -90,12 +90,17 @@
                         'mixsample-rival-all
                         (list (execution-time execution) name precision)))
 
-      ; Record number of instructions has been executed
-
+      ; Record percentage of instructions has been executed
       (when (equal? rival-status 'valid)
+        (define rival-no-repeats-instr-cnt
+          (* (+ 1 rival-iter) (vector-length (rival-machine-instructions rival-machine))))
+        (define rival-instr-cnt (vector-length rival-executions))
+        ; Report instruction that has been executed
+        (timeline-push! timeline 'instr-executed-cnt (list 'rival rival-iter rival-instr-cnt))
+        ; Report the total number of instruction that could be executed with no repeats
         (timeline-push! timeline
                         'instr-executed-cnt
-                        (list 'rival rival-iter (vector-length rival-executions))))
+                        (list 'rival-no-repeats rival-iter rival-no-repeats-instr-cnt)))
 
       ; --------------------------- Baseline execution ----------------------------------------------
       (define baseline-start-apply (current-inexact-milliseconds))