From 3102c800d72fabad384b6d22670a41f579433d99 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Fri, 28 Jan 2011 14:11:21 -0800 Subject: [PATCH] create propagation module; move files from common module --- src/common/wscript | 9 -------- .../model}/cost231-propagation-loss-model.cc | 0 .../model}/cost231-propagation-loss-model.h | 0 .../model}/jakes-propagation-loss-model.cc | 0 .../model}/jakes-propagation-loss-model.h | 0 .../model}/propagation-delay-model.cc | 0 .../model}/propagation-delay-model.h | 0 .../model}/propagation-loss-model.cc | 0 .../model}/propagation-loss-model.h | 0 .../propagation-loss-model-test-suite.cc | 0 src/propagation/wscript | 22 +++++++++++++++++++ src/wscript | 1 + 12 files changed, 23 insertions(+), 9 deletions(-) rename src/{common => propagation/model}/cost231-propagation-loss-model.cc (100%) rename src/{common => propagation/model}/cost231-propagation-loss-model.h (100%) rename src/{common => propagation/model}/jakes-propagation-loss-model.cc (100%) rename src/{common => propagation/model}/jakes-propagation-loss-model.h (100%) rename src/{common => propagation/model}/propagation-delay-model.cc (100%) rename src/{common => propagation/model}/propagation-delay-model.h (100%) rename src/{common => propagation/model}/propagation-loss-model.cc (100%) rename src/{common => propagation/model}/propagation-loss-model.h (100%) rename src/{common => propagation/test}/propagation-loss-model-test-suite.cc (100%) create mode 100644 src/propagation/wscript diff --git a/src/common/wscript b/src/common/wscript index 719282e81..5d182bd35 100644 --- a/src/common/wscript +++ b/src/common/wscript @@ -23,11 +23,6 @@ def build(bld): 'pcap-file-test-suite.cc', 'pcap-file-wrapper.cc', 'output-stream-wrapper.cc', - 'propagation-delay-model.cc', - 'propagation-loss-model.cc', - 'propagation-loss-model-test-suite.cc', - 'jakes-propagation-loss-model.cc', - 'cost231-propagation-loss-model.cc', 'spectrum-model.cc', 'spectrum-value.cc', 'spectrum-value-test.cc', @@ -59,10 +54,6 @@ def build(bld): 'pcap-file.h', 'pcap-file-wrapper.h', 'output-stream-wrapper.h', - 'propagation-delay-model.h', - 'propagation-loss-model.h', - 'jakes-propagation-loss-model.h', - 'cost231-propagation-loss-model.h', 'spectrum-model.h', 'spectrum-value.h', 'spectrum-converter.h', diff --git a/src/common/cost231-propagation-loss-model.cc b/src/propagation/model/cost231-propagation-loss-model.cc similarity index 100% rename from src/common/cost231-propagation-loss-model.cc rename to src/propagation/model/cost231-propagation-loss-model.cc diff --git a/src/common/cost231-propagation-loss-model.h b/src/propagation/model/cost231-propagation-loss-model.h similarity index 100% rename from src/common/cost231-propagation-loss-model.h rename to src/propagation/model/cost231-propagation-loss-model.h diff --git a/src/common/jakes-propagation-loss-model.cc b/src/propagation/model/jakes-propagation-loss-model.cc similarity index 100% rename from src/common/jakes-propagation-loss-model.cc rename to src/propagation/model/jakes-propagation-loss-model.cc diff --git a/src/common/jakes-propagation-loss-model.h b/src/propagation/model/jakes-propagation-loss-model.h similarity index 100% rename from src/common/jakes-propagation-loss-model.h rename to src/propagation/model/jakes-propagation-loss-model.h diff --git a/src/common/propagation-delay-model.cc b/src/propagation/model/propagation-delay-model.cc similarity index 100% rename from src/common/propagation-delay-model.cc rename to src/propagation/model/propagation-delay-model.cc diff --git a/src/common/propagation-delay-model.h b/src/propagation/model/propagation-delay-model.h similarity index 100% rename from src/common/propagation-delay-model.h rename to src/propagation/model/propagation-delay-model.h diff --git a/src/common/propagation-loss-model.cc b/src/propagation/model/propagation-loss-model.cc similarity index 100% rename from src/common/propagation-loss-model.cc rename to src/propagation/model/propagation-loss-model.cc diff --git a/src/common/propagation-loss-model.h b/src/propagation/model/propagation-loss-model.h similarity index 100% rename from src/common/propagation-loss-model.h rename to src/propagation/model/propagation-loss-model.h diff --git a/src/common/propagation-loss-model-test-suite.cc b/src/propagation/test/propagation-loss-model-test-suite.cc similarity index 100% rename from src/common/propagation-loss-model-test-suite.cc rename to src/propagation/test/propagation-loss-model-test-suite.cc diff --git a/src/propagation/wscript b/src/propagation/wscript new file mode 100644 index 000000000..c7e3b6cf4 --- /dev/null +++ b/src/propagation/wscript @@ -0,0 +1,22 @@ +## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- + +def build(bld): + module = bld.create_ns3_module('propagation', ['node', 'mobility']) + module.includes = '.' + module.source = [ + 'model/propagation-delay-model.cc', + 'model/propagation-loss-model.cc', + 'model/jakes-propagation-loss-model.cc', + 'model/cost231-propagation-loss-model.cc', + 'test/propagation-loss-model-test-suite.cc', + ] + + headers = bld.new_task_gen('ns3header') + headers.module = 'propagation' + headers.source = [ + 'model/propagation-delay-model.h', + 'model/propagation-loss-model.h', + 'model/jakes-propagation-loss-model.h', + 'model/cost231-propagation-loss-model.h', + ] + diff --git a/src/wscript b/src/wscript index f7f405ba9..43eb209c3 100644 --- a/src/wscript +++ b/src/wscript @@ -24,6 +24,7 @@ all_modules = ( 'contrib', 'node', 'internet-stack', + 'propagation', 'devices/point-to-point', 'devices/csma', 'devices/emu',