From ee268592adff4b2392939893f7a639c8362d8bd9 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Mon, 24 Aug 2020 11:35:37 +0200 Subject: [PATCH] fixup --- examples/leo-circular-orbit-tracing-example.cc | 6 +++--- helper/leo-orbit-node-helper.cc | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/examples/leo-circular-orbit-tracing-example.cc b/examples/leo-circular-orbit-tracing-example.cc index 0b6d657..315f39d 100644 --- a/examples/leo-circular-orbit-tracing-example.cc +++ b/examples/leo-circular-orbit-tracing-example.cc @@ -22,11 +22,11 @@ int main(int argc, char *argv[]) CommandLine cmd; std::string orbitFile; std::string traceFile; - Time duration; + double duration; cmd.AddValue("orbitFile", "CSV file with orbit parameters", orbitFile); cmd.AddValue("traceFile", "CSV file to store mobility trace in", traceFile); cmd.AddValue("precision", "ns3::LeoCircularOrbitMobilityModel::Precision"); - cmd.AddValue("duration", "Duration of the simulation", duration); + cmd.AddValue("duration", "Duration of the simulation in seconds", duration); cmd.Parse (argc, argv); LeoOrbitNodeHelper orbit; @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) std::cout << "Time,Satellite,x,y,z,Speed" << std::endl; - Simulator::Stop (duration); + Simulator::Stop (Seconds (duration)); Simulator::Run (); Simulator::Destroy (); diff --git a/helper/leo-orbit-node-helper.cc b/helper/leo-orbit-node-helper.cc index 6d9076b..6a364f8 100644 --- a/helper/leo-orbit-node-helper.cc +++ b/helper/leo-orbit-node-helper.cc @@ -46,15 +46,14 @@ LeoOrbitNodeHelper::Install (const std::string &orbitFile) { MobilityHelper mobility; mobility.SetPositionAllocator ("ns3::LeoCircularOrbitPostionAllocator", - "NumOrbits", IntegerValue (orbit.inc), + "NumOrbits", IntegerValue (orbit.planes), "NumSatellites", IntegerValue (orbit.sats)); mobility.SetMobilityModel ("ns3::LeoCircularOrbitMobilityModel", "Altitude", DoubleValue (orbit.alt), "Inclination", DoubleValue (orbit.inc)); NodeContainer c; - Ptr node = m_nodeFactory.Create (); - c.Add (node); + c.Create (orbit.sats*orbit.planes); mobility.Install (c); nodes.Add (c); NS_LOG_DEBUG ("Added orbit plane");