diff --git a/src/devices/spectrum/spectrum-error-model.cc b/src/devices/spectrum/spectrum-error-model.cc index 2d16a1ae9..b6d90b7d5 100644 --- a/src/devices/spectrum/spectrum-error-model.cc +++ b/src/devices/spectrum/spectrum-error-model.cc @@ -66,7 +66,7 @@ ShannonSpectrumErrorModel::EvaluateChunk (const SpectrumValue& sinr, Time durati } NS_ASSERT (vi == CapacityPerHertz.ConstValuesEnd ()); NS_LOG_LOGIC ("ChunkCapacity = " << capacity); - m_deliverableBytes += capacity * duration.GetSeconds () / 8; + m_deliverableBytes += static_cast (capacity * duration.GetSeconds () / 8); NS_LOG_LOGIC ("DeliverableBytes = " << m_deliverableBytes); } diff --git a/src/devices/spectrum/spectrum-interference-test.cc b/src/devices/spectrum/spectrum-interference-test.cc index 859c8b7c4..d533f82d7 100644 --- a/src/devices/spectrum/spectrum-interference-test.cc +++ b/src/devices/spectrum/spectrum-interference-test.cc @@ -27,7 +27,6 @@ #include #include #include -#include NS_LOG_COMPONENT_DEFINE ("SpectrumInterferenceTest"); @@ -195,10 +194,10 @@ SpectrumInterferenceTestSuite::SpectrumInterferenceTestSuite () (*s1)[1] = 7.204059965732e-16; b = 10067205.5632012; AddTestCase (new SpectrumInterferenceTestCase (s1, 1, 1, "sdBm = [-46 -48] tx bytes: 1")); - AddTestCase (new SpectrumInterferenceTestCase (s1, round (b * 0.5), 1, "sdBm = [-46 -48] tx bytes: b*0.5")); - AddTestCase (new SpectrumInterferenceTestCase (s1, round (b * (1 - e)), 1, "sdBm = [-46 -48] tx bytes: b*(1-e)")); - AddTestCase (new SpectrumInterferenceTestCase (s1, round (b * (1 + e)), 0, "sdBm = [-46 -48] tx bytes: b*(1+e)")); - AddTestCase (new SpectrumInterferenceTestCase (s1, round (b * 1.5), 0, "sdBm = [-46 -48] tx bytes: b*1.5")); + AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast (b * 0.5 + 0.5), 1, "sdBm = [-46 -48] tx bytes: b*0.5")); + AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast (b * (1 - e) + 0.5), 1, "sdBm = [-46 -48] tx bytes: b*(1-e)")); + AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast (b * (1 + e) + 0.5), 0, "sdBm = [-46 -48] tx bytes: b*(1+e)")); + AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast(b * 1.5 + 0.5), 0, "sdBm = [-46 -48] tx bytes: b*1.5")); AddTestCase (new SpectrumInterferenceTestCase (s1, 0xffffffff, 0, "sdBm = [-46 -48] tx bytes: 2^32-1")); // Power Spectral Density of the signal of interest = [-63 -61] dBm; @@ -207,10 +206,10 @@ SpectrumInterferenceTestSuite::SpectrumInterferenceTestSuite () (*s2)[1] = 3.610582885110e-17; b = 882401.591840728; AddTestCase (new SpectrumInterferenceTestCase (s2, 1, 1, "sdBm = [-63 -61] tx bytes: 1")); - AddTestCase (new SpectrumInterferenceTestCase (s2, round (b * 0.5), 1, "sdBm = [-63 -61] tx bytes: b*0.5")); - AddTestCase (new SpectrumInterferenceTestCase (s2, round (b * (1 - e)), 1, "sdBm = [-63 -61] tx bytes: b*(1-e)")); - AddTestCase (new SpectrumInterferenceTestCase (s2, round (b * (1 + e)), 0, "sdBm = [-63 -61] tx bytes: b*(1+e)")); - AddTestCase (new SpectrumInterferenceTestCase (s2, round (b * 1.5), 0, "sdBm = [-63 -61] tx bytes: b*1.5")); + AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast (b * 0.5 + 0.5), 1, "sdBm = [-63 -61] tx bytes: b*0.5")); + AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast (b * (1 - e) + 0.5), 1, "sdBm = [-63 -61] tx bytes: b*(1-e)")); + AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast (b * (1 + e) + 0.5), 0, "sdBm = [-63 -61] tx bytes: b*(1+e)")); + AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast (b * 1.5 + 0.5), 0, "sdBm = [-63 -61] tx bytes: b*1.5")); AddTestCase (new SpectrumInterferenceTestCase (s2, 0xffffffff, 0, "sdBm = [-63 -61] tx bytes: 2^32-1")); }