BWE Simulation Framework: Standard plot logging

webrtc/modules/remote_bitrate_estimator/test/metric_recorder.cc

 /*
  *  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.
  */
 
@@ skipping 112 matching lines @@
       throughput_bytes_(),
       weighted_estimate_error_(),
       last_unweighted_estimate_error_(0),
       optimal_throughput_bits_(0),
       last_available_bitrate_per_flow_kbps_(0),
       start_computing_metrics_ms_(0),
       started_computing_metrics_(false) {
 }
 
 void MetricRecorder::SetPlotInformation(
-    const std::vector<std::string>& prefixes) {
+    const std::vector<std::string>& prefixes,
+    bool plot_delay) {

[stefan-webrtc, 2015/07/24 14:06:55]

This should probably be called plot_loss_and_delay

[magalhaesc, 2015/07/25 22:35:31]

Done.

   assert(prefixes.size() == kNumMetrics);
   for (size_t i = 0; i < kNumMetrics; ++i) {
     plot_information_[i].prefix = prefixes[i];
   }
   plot_information_[kThroughput].plot_interval_ms = 100;
   plot_information_[kDelay].plot_interval_ms = 100;
   plot_information_[kLoss].plot_interval_ms = 500;
   plot_information_[kObjective].plot_interval_ms = 1000;
   plot_information_[kTotalAvailable].plot_interval_ms = 1000;
   plot_information_[kAvailablePerFlow].plot_interval_ms = 1000;
 
   for (int i = kThroughput; i < kNumMetrics; ++i) {
     plot_information_[i].last_plot_ms = 0;
-    if (i == kObjective || i == kAvailablePerFlow) {
-      plot_information_[i].plot = false;
-    } else {
-      plot_information_[i].plot = true;
+    switch (i) {
+      case kAvailablePerFlow:
+      case kObjective:
+        plot_information_[i].plot = false;
+        break;
+      case kLoss:  // Plot loss for flows of which delay is ploted.

[stefan-webrtc, 2015/07/24 14:06:55]

plotted

[magalhaesc, 2015/07/25 22:35:31]

Done.

+      case kDelay:
+        plot_information_[i].plot = plot_delay;
+        break;
+      default:
+        plot_information_[i].plot = true;
     }
   }
 }
 
 void MetricRecorder::PlotAllDynamics() {
   for (int i = kThroughput; i < kNumMetrics; ++i) {
     if (plot_information_[i].plot &&
         now_ms_ - plot_information_[i].last_plot_ms >=
             plot_information_[i].plot_interval_ms) {
       PlotDynamics(i);
@@ skipping 268 matching lines @@
 
 void MetricRecorder::ResumeFlow(int64_t paused_time_ms) {
   UpdateTime(now_ms_ + paused_time_ms);
   PlotZero();
   link_share_->ResumeFlow(flow_id_);
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc