Fixig issues in bwe plot dynamics.

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 31 matching lines @@
     return self._subplot
 
   def getYMax(self):
     return self._y_max
 
   def getNumberOfFlows(self):
     return len(self.samples)
 
 
   def addSample(self, line):
-    groups = re.search(r'_(((\d)+((,(\d)+)*))_(\D+))#\d@(\S+)', line)
+    groups = re.search(r'_(((\d)+((,(\d)+)*))_(\D+))#\d:(\d)@(\S+)', line)
 
     # Each variable will be plotted in a separated box.
     var_name = groups.group(1)
-    alg_name = groups.group(8)
+    alg_name = groups.group(9)
 
     alg_name = alg_name.replace('_', ' ')
 
     if alg_name not in self.samples.keys():
       self.samples[alg_name] = {}
 
     if var_name not in self.samples[alg_name].keys():
       self.samples[alg_name][var_name] = []
 
     sample = re.search(r'(\d+\.\d+)\t([-]?\d+\.\d+)', line)
@@ skipping 52 matching lines @@
 
     if show_legend:
       plt.legend(loc='upper center', bbox_to_anchor=(0.5, 1.40),
                  shadow=True, fontsize='large', ncol=len(v.samples))
 
 def 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:
@@ skipping 16 matching lines @@
     ax = fig.add_subplot(n, 1, v.getSubplot())
     plotVar(v, ax, i == 0, i == n - 1)
     i += 1
 
   if save_figure:
     fig.savefig(test_name + ".png")
   plt.show()
 
 if __name__ == '__main__':
   main()