KJ135
/
sgp4
mirror of http://172.16.0.12:5000/LAMPSARToolSoftware/sgp4.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make static so as not to depend on any class variables.

feature/19
Daniel Warner 2018-08-27 11:58:52 +01:00 committed by Daniel Warner
parent 2462be1a6a
commit a658fa2c5b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsgp4/SGP4.cc
View File

@ -327,7 +327,7 @@ Eci SGP4::FindPositionSDP4(double tsince) const
/* /*
* using calculated values, find position and velocity * using calculated values, find position and velocity
*/ */
return CalculateFinalPositionVelocity(tsince, return CalculateFinalPositionVelocity(elements_.Epoch().AddMinutes(tsince),
e, e,
a, a,
omega, omega,
@ -450,7 +450,7 @@ Eci SGP4::FindPositionSGP4(double tsince) const
* using calculated values, find position and velocity * using calculated values, find position and velocity
* we can pass in constants from Initialise() as these dont change * we can pass in constants from Initialise() as these dont change
*/ */
return CalculateFinalPositionVelocity(tsince, return CalculateFinalPositionVelocity(elements_.Epoch().AddMinutes(tsince),
e, e,
a, a,
omega, omega,
@ -467,7 +467,7 @@ Eci SGP4::FindPositionSGP4(double tsince) const
} }
Eci SGP4::CalculateFinalPositionVelocity( Eci SGP4::CalculateFinalPositionVelocity(
const double tsince, const DateTime& dt,
const double e, const double e,
const double a, const double a,
const double omega, const double omega,
@ -480,7 +480,7 @@ Eci SGP4::CalculateFinalPositionVelocity(
const double x1mth2, const double x1mth2,
const double x7thm1, const double x7thm1,
const double cosio, const double cosio,
const double sinio) const const double sinio)
{ {
const double beta2 = 1.0 - e * e; const double beta2 = 1.0 - e * e;
const double xn = kXKE / pow(a, 1.5); const double xn = kXKE / pow(a, 1.5);
@ -641,12 +641,12 @@ Eci SGP4::CalculateFinalPositionVelocity(
if (rk < 1.0) if (rk < 1.0)
{ {
throw DecayedException( throw DecayedException(
elements_.Epoch().AddMinutes(tsince), dt,
position, position,
velocity); velocity);
} }
return Eci(elements_.Epoch().AddMinutes(tsince), position, velocity); return Eci(dt, position, velocity);
} }
static inline double EvaluateCubicPolynomial( static inline double EvaluateCubicPolynomial(

6
libsgp4/SGP4.h
View File

@ -198,8 +198,8 @@ private:
double& aycof); double& aycof);
Eci FindPositionSDP4(const double tsince) const; Eci FindPositionSDP4(const double tsince) const;
Eci FindPositionSGP4(double tsince) const; Eci FindPositionSGP4(double tsince) const;
Eci CalculateFinalPositionVelocity( static Eci CalculateFinalPositionVelocity(
const double tsince, const DateTime& date,
const double e, const double e,
const double a, const double a,
const double omega, const double omega,
@ -212,7 +212,7 @@ private:
const double x1mth2, const double x1mth2,
const double x7thm1, const double x7thm1,
const double cosio, const double cosio,
const double sinio) const; const double sinio);
/** /**
* Deep space initialisation * Deep space initialisation
*/ */