diff --git a/gec22_demo/gec22demo_2.oedl b/gec22_demo/gec22demo_2.oedl index 952b56e..0885bce 100644 --- a/gec22_demo/gec22demo_2.oedl +++ b/gec22_demo/gec22demo_2.oedl @@ -134,17 +134,8 @@ onEvent(:ALL_UP) do Experiment.done end end - + defGraph 'DashRate1' do |g| - g.ms('dashRateAdaptation').select {[:oml_ts_client, :chosenRate_bps, :oml_sender_id]} - g.caption "DASH Selected Rate" - g.type 'line_chart3' - g.mapping :x_axis => :oml_ts_client, :y_axis => :chosenRate_bps, :group_by => :oml_sender_id - g.xaxis :legend => 'time [s]' - g.yaxis :legend => 'DASH Selected Rate [b]', :ticks => {:format => 's'} -end - -defGraph 'DashRate2' do |g| g.ms('dashRateAdaptation').select {[:oml_ts_client, :empiricalRate_bps, :oml_sender_id]} g.caption "DASH Measured Rate" g.type 'line_chart3' @@ -153,8 +144,7 @@ defGraph 'DashRate2' do |g| g.yaxis :legend => 'DASH Measured Rate [b]', :ticks => {:format => 's'} end - -defGraph 'DashRate3' do |g| +defGraph 'DashRate2' do |g| g.ms('dashRateAdaptation').select {[:oml_ts_client, :buffer_percent, :oml_sender_id]} g.caption "DASH Buffer Percentage" g.type 'line_chart3' @@ -163,6 +153,15 @@ defGraph 'DashRate3' do |g| g.yaxis :legend => 'DASH Buffer Percentage [%]', :ticks => {:format => 's'} end +defGraph 'DashRate3' do |g| + g.ms('dashRateAdaptation').select {[:oml_ts_client, :chosenRate_bps, :oml_sender_id]} + g.caption "DASH Selected Rate" + g.type 'line_chart3' + g.mapping :x_axis => :oml_ts_client, :y_axis => :chosenRate_bps, :group_by => :oml_sender_id + g.xaxis :legend => 'time [s]' + g.yaxis :legend => 'DASH Selected Rate [b]', :ticks => {:format => 's'} +end + defGraph 'DashSession1' do |g| g.ms('dashDlSession').select {[:oml_ts_client, :readSession_B, :oml_sender_id]} g.caption "DASH Download Total" diff --git a/gec22_demo/vlc-oml.oedl b/gec22_demo/vlc-oml.oedl index 186dfb0..605ee41 100644 --- a/gec22_demo/vlc-oml.oedl +++ b/gec22_demo/vlc-oml.oedl @@ -95,5 +95,5 @@ end # even after a very long period of time... here we make sure that it stops! defApplication('kill_vlc') do |app| app.quiet = true - app.binary_path = "/usr/bin/killall vlc" + app.binary_path = "/usr/bin/killall -s 9 vlc" end