Compare commits

..

No commits in common. "main" and "v0.1" have entirely different histories.
main ... v0.1

6 changed files with 6 additions and 14 deletions

View file

@ -1,5 +0,0 @@
1150.0:53.0:32:50
1110.0:53.8:32:50
1130.0:74.0:8:50
1275.0:81.0:5:75
1325.0:70.0:6:75
1 1150.0:53.0:32:50
2 1110.0:53.8:32:50
3 1130.0:74.0:8:50
4 1275.0:81.0:5:75
5 1325.0:70.0:6:75

View file

@ -1,2 +0,0 @@
1000.0:99.5:6:12
1248.0:37.4:5:9
1 1000.0:99.5:6:12
2 1248.0:37.4:5:9

View file

@ -84,7 +84,7 @@ int main (int argc, char *argv[])
LeoOrbitNodeHelper orbit;
NodeContainer satellites;
if (!orbitFile.empty())
if (orbitFile.empty())
{
satellites = orbit.Install (orbitFile);
}

View file

@ -38,7 +38,7 @@ int main(int argc, char *argv[])
CommandLine cmd;
std::string orbitFile;
std::string traceFile;
std::string duration = "60s";
double duration = 60;
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 (Time (duration));
Simulator::Stop (Seconds (duration));
Simulator::Run ();
Simulator::Destroy ();

View file

@ -136,7 +136,7 @@ int main (int argc, char *argv[])
LeoOrbitNodeHelper orbit;
NodeContainer satellites;
if (!orbitFile.empty())
if (orbitFile.empty())
{
satellites = orbit.Install (orbitFile);
}

View file

@ -123,8 +123,7 @@ LeoCircularOrbitMobilityModel::GetProgress (Time t) const
{
sign = -1;
}
// 2pi * (distance travelled / circumference of earth) + offset
return sign * (((GetSpeed () * t.GetSeconds ()) / (LEO_EARTH_RAD_KM * 1000))) + m_offset;
return sign * (2 * M_PI * ((GetSpeed () * t.GetSeconds ()) / LEO_EARTH_RAD_KM)) + m_offset;
}
Vector3D