Supporting Pause/Resume, Sending Estimate logging. Corrected plot colors

webrtc/modules/remote_bitrate_estimator/test/plot_dynamics.py

 #!/usr/bin/env python
 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # This script is used to plot simulation dynamics.
@@ skipping 55 matching lines @@
 
     s = (sample.group(1),sample.group(2))
     self._samples[alg_name][var_name].append(s)
 
 def plotVar(v, ax, show_legend, show_x_label):
   if show_x_label:
     ax.set_xlabel(v.getXLabel(), fontsize='large')
   ax.set_ylabel(v.getYLabel(), fontsize='large')
 
   for alg in v._samples.keys():
-    i = 1
+
     for series in v._samples[alg].keys():
+
       x = [sample[0] for sample in v._samples[alg][series]]
       y = [sample[1] for sample in v._samples[alg][series]]
       x = numpy.array(x)
       y = numpy.array(y)
+
       line = plt.plot(x, y, label=alg, linewidth=4.0)
-      colormap = {'Available1':'#AAAAAA',
-                  'Available2':'#AAAAAA',
-                  'GCC1':'#80D000',
-                  'GCC2':'#008000',
-                  'GCC3':'#00F000',
-                  'GCC4':'#00B000',
-                  'GCC5':'#70B020',
-                  'NADA1':'#0000AA',
-                  'NADA2':'#A0A0FF',
-                  'NADA3':'#0000FF',
-                  'NADA4':'#C0A0FF',
-                  'NADA5':'#9060B0',}
 
-      key = alg + str(i)
+      colormap = {'Available0':'#AAAAAA',
+                  'Available1':'#AAAAAA',
+                  'GCC0':'#80D000',
+                  'GCC1':'#008000',
+                  'GCC2':'#00F000',
+                  'GCC3':'#00B000',
+                  'GCC4':'#70B020',
+                  'NADA0':'#0000AA',
+                  'NADA1':'#A0A0FF',
+                  'NADA2':'#0000FF',
+                  'NADA3':'#C0A0FF',
+                  'NADA4':'#9060B0',}
+
+      flow_id = re.search(r'(\d+(,\d+)*)', series)  # One or multiple ids.
+      key = alg + flow_id.group(1)
+
       if key in colormap:
         plt.setp(line, color=colormap[key])
       elif alg == 'TCP':
         plt.setp(line, color='#AAAAAA')
       else:
         plt.setp(line, color='#654321')
 
       if alg.startswith('Available'):
         plt.setp(line, linestyle='--')
       plt.grid(True)
 
       x1, x2, y1, y2 = plt.axis()
       if v.getYMax() >= 0:
         y2 = v.getYMax()
       plt.axis((0, x2, 0, y2))
-      i += 1
 
     if show_legend:
       legend = plt.legend(loc='upper center', bbox_to_anchor=(0.5, 1.40),
-                          shadow=True, fontsize='medium', ncol=len(v._samples))
+                          shadow=True, fontsize='large', ncol=len(v._samples))
 
 if __name__ == '__main__':
 
   variables = [
           ('Throughput_kbps', "Time (s)", "Throughput (kbps)", 1, 4000),
           ('Delay_ms', "Time (s)", "One-way Delay (ms)", 2, 500),
           ('Packet_Loss', "Time (s)", "Packet Loss Ratio", 3, 1.0),
+          # ('Sending_Estimate_kbps', "Time (s)", "Sending Estimate (kbps)", 
+          #                                                        4, 4000),
           ]
 
   var = []
 
   # Create objects.
   for variable in variables:
     var.append(Variable(variable))
 
   # Add samples to the objects.
   for line in sys.stdin:
     if line.startswith("[ RUN      ]"):
         test_name = re.search('\.(\w+)', line).group(1)
     if line.startswith("PLOT"):
       for v in var:
         if v.getID() in line:
           v.addSample(line)
 
-  matplotlib.rcParams.update({'font.size': 20})
+  matplotlib.rcParams.update({'font.size': 48/len(variables)})
 
   # Plot variables.
   fig = plt.figure()
 
   # Offest and threshold on the same plot.
   n = var[-1].getSubplot()
   i = 0
   for v in var:
     ax = fig.add_subplot(n, 1, v.getSubplot())
     plotVar(v, ax, i == 0, i == n - 1)
     i += 1
 
   #fig.savefig(test_name+".jpg")
   plt.show()