Evaluate standard deviation on measured average

- Also save proper measure (mean - std; mean + std) for gnuplot
  error bars

1 files changed, 13 insertions, 3 deletions

diff --git a/pm_data_analysis/pm_data_analyzer.py b/pm_data_analysis/pm_data_analyzer.py
index ca4267a..aeab5b6 100755
--- a/pm_data_analysis/pm_data_analyzer.py
+++ b/pm_data_analysis/pm_data_analyzer.py
@@ -220,12 +220,11 @@ class Analyzer(defapp.App):
 
     # The output is one csv WSS file per ovhd type, "tss, max_ovd, avg_ovd"
     # Filename output format:
-    # pm_plugin=GSN-EDF_dist=uni_light_wss=2048_ovd=preemption.csv
+    # pm_wss=2048_ovd=preemption.csv
     # ovd: preemption, onchip, offchip, l2cache
 
     def analyze_data(self, dname, conf):
-        csvbname = dname + '/pm_plugin=' + conf['plugin'] + \
-                '_dist=uni_light_wss=' + conf['wss']
+        csvbname = dname + '/pm_wss=' + conf['wss']
 
         for tss in sorted(self.valid_ovds_list.keys(), key=int):
             if tss == 'min':
@@ -274,19 +273,28 @@ class Analyzer(defapp.App):
                     # still negative value, they shouldn't be considered
                     max_vec = np.max(vector)
                     avg_vec = np.average(vector)
+                    std_vec = np.std(vector)
                 else:
                     max_vec = 0
                     avg_vec = 0
+                    std_vec = 0
 
                 if self.options.cpufreq == 0:
                     max_vec_str = "%5.5f" % max_vec
                     avg_vec_str = "%5.5f" % avg_vec
+                    std_vec_up = "%5.5f" % (avg_vec + std_vec)
+                    std_vec_down = "%5.5f" % (avg_vec - std_vec)
+
                 else:
                     max_vec_str = "%5.5f" % (max_vec / self.options.cpufreq)
                     avg_vec_str = "%5.5f" % (avg_vec / self.options.cpufreq)
+                    std_vec_up = "%5.5f" % ((avg_vec + std_vec) / self.options.cpufreq)
+                    std_vec_down = "%5.5f" % ((avg_vec - std_vec) / self.options.cpufreq)
 
                 csvlist.append(max_vec_str)
                 csvlist.append(avg_vec_str)
+                csvlist.append(std_vec_down)
+                csvlist.append(std_vec_up)
                 pms.csv_it(csvf, csvlist)
                 csvf.close()
 
@@ -295,10 +303,12 @@ class Analyzer(defapp.App):
                         print i[1] + " overheads (ticks)"
                         print "Max = %5.5f" % max_vec
                         print "Avg = %5.5f" % avg_vec
+                        print "Std = %5.5f" % std_vec
                     else:
                         print i[1] + " overheads (us)"
                         print "Max = %5.5f" % (max_vec / self.options.cpufreq)
                         print "Avg = %5.5f" % (avg_vec / self.options.cpufreq)
+                        print "Std = %5.5f" % (std_vec / self.options.cpufreq)
 
     def process_datafile(self, datafile, dname, fname, conf):
         if self.options.verbose: