F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move gnuplot support from src/tools to src/stats

Browse Source
This commit is contained in:
Tom Henderson
2013-06-18 13:16:51 -07:00
parent 201f7e084a
commit 1071fd3d46
16 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/wireless/multirate.cc
View File

@@ -52,7 +52,7 @@
#include "ns3/network-module.h"
#include "ns3/applications-module.h"
#include "ns3/mobility-module.h"
#include "ns3/tools-module.h"
#include "ns3/stats-module.h"
#include "ns3/random-variable-stream.h"
#include "ns3/wifi-module.h"
#include "ns3/internet-module.h"

2
examples/wireless/wifi-adhoc.cc
View File

@@ -22,7 +22,7 @@
#include "ns3/network-module.h"
#include "ns3/applications-module.h"
#include "ns3/mobility-module.h"
#include "ns3/tools-module.h"
#include "ns3/stats-module.h"
#include "ns3/wifi-module.h"
#include <iostream>

2
examples/wireless/wifi-clear-channel-cmu.cc
View File

@@ -21,7 +21,7 @@
#include "ns3/core-module.h"
#include "ns3/network-module.h"
#include "ns3/mobility-module.h"
#include "ns3/tools-module.h"
#include "ns3/stats-module.h"
#include "ns3/wifi-module.h"
#include "ns3/internet-module.h"

18
examples/wireless/wscript
View File

@@ -8,16 +8,16 @@ def build(bld):
bld.register_ns3_script('mixed-wireless.py', ['core', 'mobility', 'wifi', 'applications', 'point-to-point',
'internet', 'csma', 'olsr'])
obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'applications', 'tools'])
obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'applications', 'stats'])
obj.source = 'wifi-adhoc.cc'
obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['internet', 'mobility', 'wifi', 'tools'])
obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['internet', 'mobility', 'wifi', 'stats'])
obj.source = 'wifi-clear-channel-cmu.cc'
obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'tools'])
obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'stats'])
obj.source = 'wifi-ap.cc'
bld.register_ns3_script('wifi-ap.py', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'tools'])
bld.register_ns3_script('wifi-ap.py', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'stats'])
obj = bld.create_ns3_program('wifi-wired-bridging', ['internet', 'mobility', 'wifi', 'csma', 'bridge', 'applications'])
obj.source = 'wifi-wired-bridging.cc'
@@ -25,25 +25,25 @@ def build(bld):
obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
obj.source = 'simple-wifi-frame-aggregation.cc'
obj = bld.create_ns3_program('multirate', ['internet', 'mobility', 'wifi', 'tools', 'flow-monitor', 'olsr', 'applications', 'point-to-point'])
obj = bld.create_ns3_program('multirate', ['internet', 'mobility', 'wifi', 'stats', 'flow-monitor', 'olsr', 'applications', 'point-to-point'])
obj.source = 'multirate.cc'
obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'mobility', 'wifi', 'config-store', 'tools'])
obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'mobility', 'wifi', 'config-store', 'stats'])
obj.source = 'wifi-simple-adhoc.cc'
obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['internet', 'mobility', 'wifi', 'olsr', 'config-store', 'tools', 'point-to-point'])
obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['internet', 'mobility', 'wifi', 'olsr', 'config-store', 'stats', 'point-to-point'])
obj.source = 'wifi-simple-adhoc-grid.cc'
obj = bld.create_ns3_program('wifi-simple-infra', ['internet', 'mobility', 'wifi','config-store'])
obj.source = 'wifi-simple-infra.cc'
obj = bld.create_ns3_program('wifi-simple-interference', ['internet', 'mobility', 'wifi', 'config-store', 'tools'])
obj = bld.create_ns3_program('wifi-simple-interference', ['internet', 'mobility', 'wifi', 'config-store', 'stats'])
obj.source = 'wifi-simple-interference.cc'
obj = bld.create_ns3_program('wifi-blockack', ['internet', 'mobility', 'wifi', 'applications'])
obj.source = 'wifi-blockack.cc'
obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'config-store', 'tools'])
obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'config-store', 'stats'])
obj.source = 'ofdm-validation.cc'
obj = bld.create_ns3_program('wifi-hidden-terminal', ['internet', 'mobility', 'wifi', 'applications', 'propagation', 'flow-monitor'])

0
src/tools/examples/gnuplot-example.cc → src/stats/examples/gnuplot-example.cc
View File

2
src/tools/examples/wscript → src/stats/examples/wscript
View File

@@ -4,7 +4,7 @@ def build(bld):
if not bld.env['ENABLE_EXAMPLES']:
return;
obj = bld.create_ns3_program('gnuplot-example', ['tools'])
obj = bld.create_ns3_program('gnuplot-example', ['stats'])
obj.source = 'gnuplot-example.cc'

0
src/tools/model/gnuplot.cc → src/stats/model/gnuplot.cc
View File

0
src/tools/model/gnuplot.h → src/stats/model/gnuplot.h
View File

0
src/tools/test/examples-to-run.py → src/stats/test/examples-to-run.py
View File

5
src/stats/wscript
View File

@@ -19,6 +19,7 @@ def build(bld):
'model/data-output-interface.cc',
'model/omnet-data-output.cc',
'model/data-collector.cc',
'model/gnuplot.cc',
]
module_test = bld.create_ns3_module_test_library('stats')
@@ -36,6 +37,7 @@ def build(bld):
'model/data-output-interface.h',
'model/omnet-data-output.h',
'model/data-collector.h',
'model/gnuplot.h',
]
if bld.env['SQLITE_STATS']:
@@ -43,4 +45,7 @@ def build(bld):
obj.source.append('model/sqlite-data-output.cc')
obj.use.append('SQLITE3')
if (bld.env['ENABLE_EXAMPLES']):
bld.recurse('examples')
bld.ns3_python_bindings()

6
src/tools/wscript
View File

@@ -4,7 +4,6 @@ def build(bld):
module = bld.create_ns3_module('tools', ['network', 'stats'])
module.source = [
'model/gnuplot.cc',
'model/delay-jitter-estimation.cc',
]
@@ -17,11 +16,6 @@ def build(bld):
headers.module = 'tools'
headers.source = [
'model/average.h',
'model/gnuplot.h',
'model/delay-jitter-estimation.h',
]
if (bld.env['ENABLE_EXAMPLES']):
bld.recurse('examples')
bld.ns3_python_bindings()

2
src/uan/examples/uan-cw-example.cc
View File

@@ -40,7 +40,7 @@
#include "ns3/core-module.h"
#include "ns3/network-module.h"
#include "ns3/mobility-module.h"
#include "ns3/tools-module.h"
#include "ns3/stats-module.h"
#include "ns3/applications-module.h"
#include <fstream>

2
src/uan/examples/uan-cw-example.h
View File

@@ -22,7 +22,7 @@
#define UAN_CW_EXAMPLE_H
#include "ns3/network-module.h"
#include "ns3/tools-module.h"
#include "ns3/stats-module.h"
#include "ns3/uan-module.h"
using namespace ns3;

2
src/uan/examples/uan-rc-example.cc
View File

@@ -59,7 +59,7 @@
#include "ns3/log.h"
#include "ns3/config.h"
#include "ns3/callback.h"
#include "ns3/tools-module.h"
#include "ns3/stats-module.h"
#include <fstream>

2
src/uan/examples/uan-rc-example.h
View File

@@ -22,7 +22,7 @@
#define UAN_RC_EXAMPLE_H
#include "ns3/network-module.h"
#include "ns3/tools-module.h"
#include "ns3/stats-module.h"
#include "ns3/uan-module.h"
using namespace ns3;

4
src/uan/examples/wscript
View File

@@ -1,8 +1,8 @@
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
def build(bld):
obj = bld.create_ns3_program('uan-cw-example', ['internet', 'mobility', 'tools', 'applications', 'uan'])
obj = bld.create_ns3_program('uan-cw-example', ['internet', 'mobility', 'stats', 'applications', 'uan'])
obj.source = 'uan-cw-example.cc'
obj = bld.create_ns3_program('uan-rc-example', ['internet', 'mobility', 'tools', 'applications', 'uan'])
obj = bld.create_ns3_program('uan-rc-example', ['internet', 'mobility', 'stats', 'applications', 'uan'])
obj.source = 'uan-rc-example.cc'