From 0a7f41818d5f911a1c5460ffc689c137d654b07b Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Fri, 18 Sep 2020 15:21:19 +0200 Subject: [PATCH] Fix fallback to hardcoded orbits If orbitFile was defined a fallback was made to hardcoded orbits. --- examples/leo-circular-orbit-tracing-example.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/leo-circular-orbit-tracing-example.cc b/examples/leo-circular-orbit-tracing-example.cc index 980b74a..d8718e9 100644 --- a/examples/leo-circular-orbit-tracing-example.cc +++ b/examples/leo-circular-orbit-tracing-example.cc @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) CommandLine cmd; std::string orbitFile; std::string traceFile; - double duration = 60; + std::string duration = "60s"; 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"); @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) LeoOrbitNodeHelper orbit; NodeContainer satellites; - if (orbitFile.empty()) + if (!orbitFile.empty()) { satellites = orbit.Install (orbitFile); } @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) std::cout << "Time,Satellite,x,y,z,Speed" << std::endl; - Simulator::Stop (Seconds (duration)); + Simulator::Stop (Time (duration)); Simulator::Run (); Simulator::Destroy ();