From f91c663c931ce2e24f98e80d4e7e5cd3e826c654 Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Tue, 5 Jul 2011 16:53:34 -0700 Subject: [PATCH] Cast some double arguments to uint64_t --- src/spectrum/test/spectrum-ideal-phy-test.cc | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/spectrum/test/spectrum-ideal-phy-test.cc b/src/spectrum/test/spectrum-ideal-phy-test.cc index 8f01bb838..df4575b4d 100644 --- a/src/spectrum/test/spectrum-ideal-phy-test.cc +++ b/src/spectrum/test/spectrum-ideal-phy-test.cc @@ -177,7 +177,7 @@ SpectrumIdealPhyTestCase::DoRun (void) OnOffHelper onoff ("ns3::PacketSocketFactory", Address (socket)); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (250))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); - onoff.SetAttribute ("DataRate", DataRateValue (DataRate (1.2*phyRate))); + onoff.SetAttribute ("DataRate", DataRateValue (DataRate (static_cast (1.2*phyRate)))); onoff.SetAttribute ("PacketSize", UintegerValue (pktSize)); ApplicationContainer apps = onoff.Install (c.Get (0)); @@ -221,22 +221,22 @@ SpectrumIdealPhyTestSuite::SpectrumIdealPhyTestSuite () for (double snr = 0.01; snr <= 10 ; snr *= 2) { double achievableRate = g_bandwidth*log2(1+snr); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.1, true, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.5, true, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.95, true, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*1.05, false, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*2, false, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*4, false, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.1), true, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.5), true, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.95), true, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*1.05), false, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*2), false, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*4), false, "ns3::SingleModelSpectrumChannel")); } for (double snr = 0.01; snr <= 10 ; snr *= 10) { double achievableRate = g_bandwidth*log2(1+snr); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.1, true, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.5, true, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.95, true, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*1.05, false, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*2, false, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*4, false, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.1), true, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.5), true, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.95), true, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*1.05), false, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*2), false, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*4), false, "ns3::MultiModelSpectrumChannel")); } }