diff --git a/src/lte/wscript b/src/lte/wscript index dcf85dbfc..2651b7129 100644 --- a/src/lte/wscript +++ b/src/lte/wscript @@ -85,7 +85,6 @@ def build(bld): 'model/cqa-ff-mac-scheduler.cc', 'model/epc-gtpu-header.cc', 'model/epc-gtpc-header.cc', - 'model/trace-fading-loss-model.cc', 'model/epc-enb-application.cc', 'model/epc-sgw-pgw-application.cc', 'model/epc-sgw-application.cc', @@ -278,7 +277,6 @@ def build(bld): 'model/tdtbfq-ff-mac-scheduler.h', 'model/pss-ff-mac-scheduler.h', 'model/cqa-ff-mac-scheduler.h', - 'model/trace-fading-loss-model.h', 'model/epc-gtpu-header.h', 'model/epc-gtpc-header.h', 'model/epc-enb-application.h', diff --git a/src/lte/model/trace-fading-loss-model.cc b/src/spectrum/model/trace-fading-loss-model.cc similarity index 99% rename from src/lte/model/trace-fading-loss-model.cc rename to src/spectrum/model/trace-fading-loss-model.cc index e9569b161..90ea89b9d 100644 --- a/src/lte/model/trace-fading-loss-model.cc +++ b/src/spectrum/model/trace-fading-loss-model.cc @@ -59,7 +59,7 @@ TraceFadingLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::TraceFadingLossModel") .SetParent () - .SetGroupName("Lte") + .SetGroupName ("Spectrum") .AddConstructor () .AddAttribute ("TraceFilename", "Name of file to load a trace from.", diff --git a/src/lte/model/trace-fading-loss-model.h b/src/spectrum/model/trace-fading-loss-model.h similarity index 99% rename from src/lte/model/trace-fading-loss-model.h rename to src/spectrum/model/trace-fading-loss-model.h index 6937ae936..aec12a64c 100644 --- a/src/lte/model/trace-fading-loss-model.h +++ b/src/spectrum/model/trace-fading-loss-model.h @@ -37,7 +37,7 @@ class MobilityModel; /** - * \ingroup lte + * \ingroup spectrum * * \brief fading loss model based on precalculated fading traces */ diff --git a/src/spectrum/wscript b/src/spectrum/wscript index 9d55709e6..de19208f9 100644 --- a/src/spectrum/wscript +++ b/src/spectrum/wscript @@ -29,6 +29,7 @@ def build(bld): 'model/non-communicating-net-device.cc', 'model/microwave-oven-spectrum-value-helper.cc', 'model/tv-spectrum-transmitter.cc', + 'model/trace-fading-loss-model.cc', 'helper/spectrum-helper.cc', 'helper/adhoc-aloha-noack-ideal-phy-helper.cc', 'helper/waveform-generator-helper.cc', @@ -74,6 +75,7 @@ def build(bld): 'model/non-communicating-net-device.h', 'model/microwave-oven-spectrum-value-helper.h', 'model/tv-spectrum-transmitter.h', + 'model/trace-fading-loss-model.h', 'helper/spectrum-helper.h', 'helper/adhoc-aloha-noack-ideal-phy-helper.h', 'helper/waveform-generator-helper.h',