diff --git a/bindings/python/src/OpenSpaceToolkitAstrodynamicsPy/Utility/ArrayCasting.hpp b/bindings/python/src/OpenSpaceToolkitAstrodynamicsPy/Utility/ArrayCasting.hpp index 8aad96fe0..6cd6420b1 100644 --- a/bindings/python/src/OpenSpaceToolkitAstrodynamicsPy/Utility/ArrayCasting.hpp +++ b/bindings/python/src/OpenSpaceToolkitAstrodynamicsPy/Utility/ArrayCasting.hpp @@ -17,8 +17,8 @@ struct type_caster> : list_caster, T> { }; -// using list_caster::load ; -// using list_caster::cast ; +// using list_caster::load; +// using list_caster::cast; } // namespace detail } // namespace pybind11 diff --git a/include/OpenSpaceToolkit/Astrodynamics/Conjunction/Message/CCSDS/CDM.hpp b/include/OpenSpaceToolkit/Astrodynamics/Conjunction/Message/CCSDS/CDM.hpp index 336e75b6a..98517a0a3 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Conjunction/Message/CCSDS/CDM.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Conjunction/Message/CCSDS/CDM.hpp @@ -157,7 +157,7 @@ class CDM { // OD Parameters - // String ODComment = String::Empty() ; + // String ODComment = String::Empty(); Instant timeLastObStart = Instant::Undefined(); Instant timeLastObEnd = Instant::Undefined(); Duration recommendedODSpan = Duration::Undefined(); @@ -171,7 +171,7 @@ class CDM // Additional Parameters - // String additionParametersComment ; + // String additionParametersComment; Real areaPC = Real::Undefined(); // Area, add Unit Real areaDrag = Real::Undefined(); Real areaSRP = Real::Undefined(); @@ -183,12 +183,12 @@ class CDM // State Vector - // String stateVectorComment ; + // String stateVectorComment; State state; // Covariance Matrix - // String covarianceComment ; + // String covarianceComment; MatrixXd covarianceMatrix; // Usually defined in RTN Frame }; diff --git a/include/OpenSpaceToolkit/Astrodynamics/Dynamics.hpp b/include/OpenSpaceToolkit/Astrodynamics/Dynamics.hpp index db5c798cd..b9b762bd4 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Dynamics.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Dynamics.hpp @@ -73,7 +73,7 @@ class Dynamics /// @brief Output stream operator /// /// @code{.cpp} - /// std::cout << Dynamics(...) ; + /// std::cout << Dynamics(...); /// @endcode /// /// @param anOutputStream An output stream diff --git a/include/OpenSpaceToolkit/Astrodynamics/Dynamics/Tabulated.hpp b/include/OpenSpaceToolkit/Astrodynamics/Dynamics/Tabulated.hpp index 893977148..ff9eecd70 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Dynamics/Tabulated.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Dynamics/Tabulated.hpp @@ -63,7 +63,7 @@ class Tabulated : public Dynamics /// @brief Output stream operator /// /// @code{.cpp} - /// std::cout << Dynamics(...) ; + /// std::cout << Dynamics(...); /// @endcode /// /// @param anOutputStream An output stream diff --git a/include/OpenSpaceToolkit/Astrodynamics/EventCondition.hpp b/include/OpenSpaceToolkit/Astrodynamics/EventCondition.hpp index e7d2768a4..ca9b6e14e 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/EventCondition.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/EventCondition.hpp @@ -83,7 +83,7 @@ class EventCondition /// @brief Output stream operator /// /// @code{.cpp} - /// std::cout << EventCondition(...) ; + /// std::cout << EventCondition(...); /// @endcode /// /// @param anOutputStream An output stream diff --git a/include/OpenSpaceToolkit/Astrodynamics/Flight/Maneuver.hpp b/include/OpenSpaceToolkit/Astrodynamics/Flight/Maneuver.hpp index 8d9d62e48..3afc50238 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Flight/Maneuver.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Flight/Maneuver.hpp @@ -95,7 +95,7 @@ class Maneuver /// @brief Output stream operator /// /// @code{.cpp} - /// std::cout << Maneuver(...) ; + /// std::cout << Maneuver(...); /// @endcode /// /// @param anOutputStream An output stream diff --git a/include/OpenSpaceToolkit/Astrodynamics/Flight/Profile.hpp b/include/OpenSpaceToolkit/Astrodynamics/Flight/Profile.hpp index a3e4570e2..ba6dd6fb3 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Flight/Profile.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Flight/Profile.hpp @@ -191,7 +191,7 @@ class Profile /// @brief Output stream operator /// /// @code{.cpp} - /// std::cout << Profile(...) ; + /// std::cout << Profile(...); /// @endcode /// /// @param anOutputStream An output stream @@ -202,7 +202,7 @@ class Profile /// @brief Check if profile is defined /// /// @code{.cpp} - /// Profile(...).isDefined() ; + /// Profile(...).isDefined(); /// @endcode /// /// @return True if profile is defined @@ -211,9 +211,9 @@ class Profile /// @brief Get state at a given instant /// /// @code{.cpp} - /// Profile profile = { ... } ; - /// Instant instant = { ... } ; - /// State state = profile.getStateAt(instant) ; + /// Profile profile = { ... }; + /// Instant instant = { ... }; + /// State state = profile.getStateAt(instant); /// @endcode /// /// @param anInstant An instant @@ -223,9 +223,9 @@ class Profile /// @brief Get states at a given instants /// /// @code{.cpp} - /// Profile profile = { ... } ; - /// Array instants = { ... } ; - /// Array state = profile.getStatesAt(instants) ; + /// Profile profile = { ... }; + /// Array instants = { ... }; + /// Array state = profile.getStatesAt(instants); /// @endcode /// /// @param anInstantArray An array of instants @@ -235,9 +235,9 @@ class Profile /// @brief Get axes at a given instant /// /// @code{.cpp} - /// Profile profile = { ... } ; - /// Instant instant = { ... } ; - /// Axes axes = profile.getAxesAt(instant) ; + /// Profile profile = { ... }; + /// Instant instant = { ... }; + /// Axes axes = profile.getAxesAt(instant); /// @endcode /// /// @param anInstant An instant @@ -253,8 +253,8 @@ class Profile /// @brief Print flight profile to output stream /// /// @code{.cpp} - /// Profile profile = { ... } ; - /// profile.print(std::cout, true) ; + /// Profile profile = { ... }; + /// profile.print(std::cout, true); /// @endcode /// /// @param anOutputStream An output stream @@ -264,7 +264,7 @@ class Profile /// @brief Constructs an undefined flight profile /// /// @code{.cpp} - /// Profile profile = Profile::Undefined() ; // Undefined + /// Profile profile = Profile::Undefined(); // Undefined /// @endcode /// /// @return Undefined profile diff --git a/include/OpenSpaceToolkit/Astrodynamics/Flight/System.hpp b/include/OpenSpaceToolkit/Astrodynamics/Flight/System.hpp index 9880137e1..65a7c21a3 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Flight/System.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Flight/System.hpp @@ -28,9 +28,9 @@ class System /// @brief Constructor /// /// @code{.cpp} - /// Mass mass = { ... } ; - /// Composite composite ( ... ) ; - /// System system = { mass, composite } ; + /// Mass mass = { ... }; + /// Composite composite ( ... ); + /// System system = { mass, composite }; /// @endcode /// /// @param aMass A mass @@ -78,7 +78,7 @@ class System /// @brief Get system's mass /// /// @code{.cpp} - /// Mass mass = system.getMass() ; + /// Mass mass = system.getMass(); /// @endcode /// /// @return Mass @@ -87,7 +87,7 @@ class System /// @brief Get system's geometry /// /// @code{.cpp} - /// Mass mass = system.getGeometry() ; + /// Mass mass = system.getGeometry(); /// @endcode /// /// @return Composite diff --git a/include/OpenSpaceToolkit/Astrodynamics/Flight/System/SatelliteSystem.hpp b/include/OpenSpaceToolkit/Astrodynamics/Flight/System/SatelliteSystem.hpp index 98abd6ba0..ae3499e4e 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Flight/System/SatelliteSystem.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Flight/System/SatelliteSystem.hpp @@ -45,14 +45,14 @@ class SatelliteSystem : public System /// @brief Constructor /// /// @code{.cpp} - /// Mass mass = { ... } ; - /// Composite composite ( ... ) ; - /// Matrix3d intertiaTensor ( ... ) ; - /// Real crossSectionalSurfaceArea = 0.8 ; - /// Real dragCoefficient = 2.2 ; - /// PropulsionSystem propulsionSystem = { ... } ; + /// Mass mass = { ... }; + /// Composite composite ( ... ); + /// Matrix3d intertiaTensor ( ... ); + /// Real crossSectionalSurfaceArea = 0.8; + /// Real dragCoefficient = 2.2; + /// PropulsionSystem propulsionSystem = { ... }; /// System system = { mass, composite, intertiaTensor, crossSectionalSurfaceArea, - /// dragCoefficient, propulsionSystem } ; + /// dragCoefficient, propulsionSystem }; /// @endcode /// /// @param aDryMass A dry mass (without propellant) @@ -105,7 +105,7 @@ class SatelliteSystem : public System /// @brief Access satellite system's propulsion system /// /// @code{.cpp} - /// PropulsionSystem propulsionSystem = satelliteSystem.accessPropulsionSystem() ; + /// PropulsionSystem propulsionSystem = satelliteSystem.accessPropulsionSystem(); /// @endcode /// /// @return PropulsionSystem @@ -114,7 +114,7 @@ class SatelliteSystem : public System /// @brief Get satellite system's inertia tensor /// /// @code{.cpp} - /// Matrix3d inertiaTensor = satelliteSystem.getInertiaTensor() ; + /// Matrix3d inertiaTensor = satelliteSystem.getInertiaTensor(); /// @endcode /// /// @return Matrix3d @@ -123,7 +123,7 @@ class SatelliteSystem : public System /// @brief Get satellite system's surface area /// /// @code{.cpp} - /// Real surfaceArea = satelliteSystem.getCrossSectionalSurfaceArea() ; + /// Real surfaceArea = satelliteSystem.getCrossSectionalSurfaceArea(); /// @endcode /// /// @return Real @@ -132,7 +132,7 @@ class SatelliteSystem : public System /// @brief Get satellite system's drag coefficient /// /// @code{.cpp} - /// Real dragCoefficient = satelliteSystem.getDragCoefficient() ; + /// Real dragCoefficient = satelliteSystem.getDragCoefficient(); /// @endcode /// /// @return Real @@ -141,7 +141,7 @@ class SatelliteSystem : public System /// @brief Get satellite system's propulsion system /// /// @code{.cpp} - /// PropulsionSystem propulsionSystem = satelliteSystem.getPropulsionSystem() ; + /// PropulsionSystem propulsionSystem = satelliteSystem.getPropulsionSystem(); /// @endcode /// /// @return PropulsionSystem diff --git a/include/OpenSpaceToolkit/Astrodynamics/GuidanceLaw.hpp b/include/OpenSpaceToolkit/Astrodynamics/GuidanceLaw.hpp index 2e4fd0fe7..ffebfebf7 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/GuidanceLaw.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/GuidanceLaw.hpp @@ -43,7 +43,7 @@ class GuidanceLaw /// @brief Output stream operator /// /// @code{.cpp} - /// std::cout << GuidanceLaw(...) ; + /// std::cout << GuidanceLaw(...); /// @endcode /// /// @param anOutputStream An output stream diff --git a/include/OpenSpaceToolkit/Astrodynamics/GuidanceLaw/QLaw.hpp b/include/OpenSpaceToolkit/Astrodynamics/GuidanceLaw/QLaw.hpp index ac729e3a5..75ed5e33e 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/GuidanceLaw/QLaw.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/GuidanceLaw/QLaw.hpp @@ -129,7 +129,7 @@ class QLaw : public GuidanceLaw /// @brief Output stream operator /// /// @code{.cpp} - /// std::cout << QLaw(...) ; + /// std::cout << QLaw(...); /// @endcode /// /// @param anOutputStream An output stream diff --git a/include/OpenSpaceToolkit/Astrodynamics/Trajectory.hpp b/include/OpenSpaceToolkit/Astrodynamics/Trajectory.hpp index f19aa5f70..cc8e76bc4 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Trajectory.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Trajectory.hpp @@ -40,8 +40,8 @@ class Trajectory /// @brief Constructor (model) /// /// @code{.cpp} - /// Tabulated model = Tabulated::Load(File::Path(Path::Parse("/path/to/trajectory.csv"))) ; - /// Trajectory trajectory = { model } ; + /// Tabulated model = Tabulated::Load(File::Path(Path::Parse("/path/to/trajectory.csv"))); + /// Trajectory trajectory = { model }; /// @endcode /// /// @param aModel A trajectory model @@ -50,8 +50,8 @@ class Trajectory /// @brief Constructor (state array) /// /// @code{.cpp} - /// Array stateArray = { ... } ; - /// Trajectory trajectory = { stateArray } ; + /// Array stateArray = { ... }; + /// Trajectory trajectory = { stateArray }; /// @endcode /// /// @param aStateArray An array of states @@ -68,7 +68,7 @@ class Trajectory /// @brief Equal to operator /// /// @code{.cpp} - /// Trajectory(...) == Trajectory(...) ; + /// Trajectory(...) == Trajectory(...); /// @endcode /// /// @param aTrajectory A trajectory @@ -78,7 +78,7 @@ class Trajectory /// @brief Not equal to operator /// /// @code{.cpp} - /// Trajectory(...) != Trajectory(...) ; + /// Trajectory(...) != Trajectory(...); /// @endcode /// /// @param aTrajectory A trajectory @@ -88,7 +88,7 @@ class Trajectory /// @brief Output stream operator /// /// @code{.cpp} - /// std::cout << Trajectory(...) ; + /// std::cout << Trajectory(...); /// @endcode /// /// @param anOutputStream An output stream @@ -99,7 +99,7 @@ class Trajectory /// @brief Check if trajectory is defined /// /// @code{.cpp} - /// Trajectory(...).isDefined() ; + /// Trajectory(...).isDefined(); /// @endcode /// /// @return True if trajectory is defined @@ -113,9 +113,9 @@ class Trajectory /// @brief Get state at a given instant /// /// @code{.cpp} - /// Trajectory trajectory = { ... } ; - /// Instant instant = { ... } ; - /// State state = trajectory.getStateAt(instant) ; + /// Trajectory trajectory = { ... }; + /// Instant instant = { ... }; + /// State state = trajectory.getStateAt(instant); /// @endcode /// /// @param anInstant An instant @@ -125,9 +125,9 @@ class Trajectory /// @brief Get states at a given instants /// /// @code{.cpp} - /// Trajectory trajectory = { ... } ; - /// Array instants = { ... } ; - /// Array state = trajectory.getStatesAt(instants) ; + /// Trajectory trajectory = { ... }; + /// Array instants = { ... }; + /// Array state = trajectory.getStatesAt(instants); /// @endcode /// /// @param anInstantArray An array of instants @@ -137,8 +137,8 @@ class Trajectory /// @brief Print trajectory to output stream /// /// @code{.cpp} - /// Trajectory trajectory = { ... } ; - /// trajectory.print(std::cout, true) ; + /// Trajectory trajectory = { ... }; + /// trajectory.print(std::cout, true); /// @endcode /// /// @param anOutputStream An output stream @@ -148,7 +148,7 @@ class Trajectory /// @brief Constructs an undefined trajectory /// /// @code{.cpp} - /// Trajectory trajectory = Trajectory::Undefined() ; // Undefined + /// Trajectory trajectory = Trajectory::Undefined(); // Undefined /// @endcode /// /// @return Undefined trajectory @@ -157,8 +157,8 @@ class Trajectory /// @brief Constructs a trajectory from a given position /// /// @code{.cpp} - /// Position position = Position::Meters({ 0.0, 0.0, 0.0 }, Frame::GCRF()) ; - /// Trajectory trajectory = Trajectory::Position(position) ; + /// Position position = Position::Meters({ 0.0, 0.0, 0.0 }, Frame::GCRF()); + /// Trajectory trajectory = Trajectory::Position(position); /// @endcode /// /// @param aPosition A position diff --git a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Model/Static.hpp b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Model/Static.hpp index 717d1533e..3ed7fa559 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Model/Static.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Model/Static.hpp @@ -32,8 +32,8 @@ class Static : public virtual Model /// @brief Constructor /// /// @code{.cpp} - /// Position position = { ... } ; - /// Static staticModel(position) ; + /// Position position = { ... }; + /// Static staticModel(position); /// @endcode /// /// @param aPosition The position of the static model. Must be provided in the ITRF frame. @@ -42,8 +42,8 @@ class Static : public virtual Model /// @brief Clone the static model /// /// @code{.cpp} - /// Static staticModel = { ... } ; - /// Static* clonedModel = staticModel.clone() ; + /// Static staticModel = { ... }; + /// Static* clonedModel = staticModel.clone(); /// @endcode /// /// @return A pointer to the cloned static model @@ -52,9 +52,9 @@ class Static : public virtual Model /// @brief Equality operator /// /// @code{.cpp} - /// Static staticModel1 = { ... } ; - /// Static staticModel2 = { ... } ; - /// bool isEqual = (staticModel1 == staticModel2) ; + /// Static staticModel1 = { ... }; + /// Static staticModel2 = { ... }; + /// bool isEqual = (staticModel1 == staticModel2); /// @endcode /// /// @param aStaticModel The static model to compare with @@ -64,9 +64,9 @@ class Static : public virtual Model /// @brief Inequality operator /// /// @code{.cpp} - /// Static staticModel1 = { ... } ; - /// Static staticModel2 = { ... } ; - /// bool isNotEqual = (staticModel1 != staticModel2) ; + /// Static staticModel1 = { ... }; + /// Static staticModel2 = { ... }; + /// bool isNotEqual = (staticModel1 != staticModel2); /// @endcode /// /// @param aStaticModel The static model to compare with @@ -76,8 +76,8 @@ class Static : public virtual Model /// @brief Output stream operator /// /// @code{.cpp} - /// Static staticModel = { ... } ; - /// std::cout << staticModel ; + /// Static staticModel = { ... }; + /// std::cout << staticModel; /// @endcode /// /// @param anOutputStream The output stream @@ -88,8 +88,8 @@ class Static : public virtual Model /// @brief Check if the static model is defined /// /// @code{.cpp} - /// Static staticModel = { ... } ; - /// bool isDefined = staticModel.isDefined() ; + /// Static staticModel = { ... }; + /// bool isDefined = staticModel.isDefined(); /// @endcode /// /// @return True if the model is defined, false otherwise @@ -98,9 +98,9 @@ class Static : public virtual Model /// @brief Calculate the state at a given instant /// /// @code{.cpp} - /// Static staticModel = { ... } ; - /// Instant instant = { ... } ; - /// State state = staticModel.calculateStateAt(instant) ; + /// Static staticModel = { ... }; + /// Instant instant = { ... }; + /// State state = staticModel.calculateStateAt(instant); /// @endcode /// /// @param anInstant The instant at which to calculate the state @@ -110,8 +110,8 @@ class Static : public virtual Model /// @brief Print the static model to an output stream /// /// @code{.cpp} - /// Static staticModel = { ... } ; - /// staticModel.print(std::cout, true) ; + /// Static staticModel = { ... }; + /// staticModel.print(std::cout, true); /// @endcode /// /// @param anOutputStream The output stream @@ -122,9 +122,9 @@ class Static : public virtual Model /// @brief Equality operator for Model base class /// /// @code{.cpp} - /// Static staticModel = { ... } ; - /// Model model = { ... } ; - /// bool isEqual = (staticModel == model) ; + /// Static staticModel = { ... }; + /// Model model = { ... }; + /// bool isEqual = (staticModel == model); /// @endcode /// /// @param aModel The model to compare with @@ -134,9 +134,9 @@ class Static : public virtual Model /// @brief Inequality operator for Model base class /// /// @code{.cpp} - /// Static staticModel = { ... } ; - /// Model model = { ... } ; - /// bool isNotEqual = (staticModel != model) ; + /// Static staticModel = { ... }; + /// Model model = { ... }; + /// bool isNotEqual = (staticModel != model); /// @endcode /// /// @param aModel The model to compare with diff --git a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.hpp b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.hpp index 9519aa358..81af6a3e7 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.hpp @@ -108,7 +108,7 @@ class COE /// @brief Output stream operator /// /// @code{.cpp} - /// std::cout << COE(...) ; + /// std::cout << COE(...); /// @endcode /// /// @param anOutputStream An output stream diff --git a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Propagated.hpp b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Propagated.hpp index 3aad7a65c..c2b021a93 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Propagated.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Propagated.hpp @@ -43,9 +43,9 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// @brief Constructor /// /// @code{.cpp} - /// Propagated propagated = { aPropagator, aState } ; + /// Propagated propagated = { aPropagator, aState }; /// or - /// Propagated propagated = { aPropagator, aState, aRevolutionNumber } ; + /// Propagated propagated = { aPropagator, aState, aRevolutionNumber }; /// @endcode /// /// @param aPropagator A propagator @@ -56,9 +56,9 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// @brief Constructor with a cached state array /// /// @code{.cpp} - /// Propagated propagated = { aPropagator, aCachedStateArray } ; + /// Propagated propagated = { aPropagator, aCachedStateArray }; /// or - /// Propagated propagated = { aPropagator, aCachedStateArray, aRevolutionNumber } ; + /// Propagated propagated = { aPropagator, aCachedStateArray, aRevolutionNumber }; /// @endcode /// /// @param aPropagator A propagator @@ -100,7 +100,7 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// @brief Get epoch (in this case it is the first instant in the cached state array) /// /// @code{.cpp} - /// Instant instant = propagated.getEpoch() ; + /// Instant instant = propagated.getEpoch(); /// @endcode /// /// @return Instant @@ -109,7 +109,7 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// @brief Get revolution number at epoch (it is equal to 1) /// /// @code{.cpp} - /// Real real = propagated.getRevolutionNumberAtEpoch() ; + /// Real real = propagated.getRevolutionNumberAtEpoch(); /// @endcode /// /// @return Integer @@ -118,7 +118,7 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// @brief Calculate the state at an instant, given initial state /// @code{.cpp} - /// State state = propagated.calculateStateAt(anInstant) ; + /// State state = propagated.calculateStateAt(anInstant); /// @endcode /// @param anInstant An instant /// @return State @@ -129,7 +129,7 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// instant array /// @code{.cpp} - /// Array states = propagated.calculateStatesAt(anInstantArray) ; + /// Array states = propagated.calculateStatesAt(anInstantArray); /// @endcode /// @param aState An initial state /// @param anInstantArray An instant @@ -139,7 +139,7 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// @brief Calculate the revolution number at an instant /// /// @code{.cpp} - /// Integer integer = propagated.calculateRevolutionNumberAt(anInstant) ; + /// Integer integer = propagated.calculateRevolutionNumberAt(anInstant); /// @endcode /// @param anInstant An instant /// @return Integer @@ -148,7 +148,7 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// @brief Fetch internal cached state array /// /// @code{.cpp} - /// Array stateArray = propagated.accessCachedStateArray() ; + /// Array stateArray = propagated.accessCachedStateArray(); /// @endcode /// @return Array& const Array& accessCachedStateArray() const; @@ -156,7 +156,7 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// @brief Access propagator /// /// @code{.cpp} - /// Propagator propagator = propagated.accessPropagator() ; + /// Propagator propagator = propagated.accessPropagator(); /// @endcode /// /// @return Propagator @@ -165,8 +165,8 @@ class Propagated : public ostk::astrodynamics::trajectory::orbit::Model /// @brief Set internal cached state array manually /// /// @code{.cpp} - /// Array stateArray = { ... } ; - /// propagated.setCachedStateArray(stateArray) ; + /// Array stateArray = { ... }; + /// propagated.setCachedStateArray(stateArray); /// @endcode /// @param aStateArray A state array void setCachedStateArray(const Array& aStateArray); diff --git a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4/TLE.hpp b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4/TLE.hpp index c1f92edf5..2ec9e34d3 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4/TLE.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4/TLE.hpp @@ -45,7 +45,7 @@ class TLE /// /// @code{.cpp} /// TLE tle("1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 2927", - /// "2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537") ; + /// "2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537"); /// @endcode /// /// @param aFirstLine A first line @@ -57,7 +57,7 @@ class TLE /// @code{.cpp} /// TLE tle("ISS (ZARYA)", /// "1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 2927", - /// "2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537") ; + /// "2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537"); /// @endcode /// /// @param aSatelliteName A satellite name @@ -68,7 +68,7 @@ class TLE /// @brief Equal to operator /// /// @code{.cpp} - /// TLE("...", "...") == TLE("...", "...") ; + /// TLE("...", "...") == TLE("...", "..."); /// @endcode /// /// @param aTle A TLE @@ -78,7 +78,7 @@ class TLE /// @brief Not equal to operator /// /// @code{.cpp} - /// TLE("...", "...") != TLE("...", "...") ; + /// TLE("...", "...") != TLE("...", "..."); /// @endcode /// /// @param aTle A TLE @@ -88,8 +88,8 @@ class TLE /// @brief Output stream operator /// /// @code{.cpp} - /// TLE tle("...", "...") ; - /// std::cout << tle ; + /// TLE tle("...", "..."); + /// std::cout << tle; /// @endcode /// /// @param anOutputStream An output stream @@ -101,7 +101,7 @@ class TLE /// /// @code{.cpp} /// TLE("1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 2927", - /// "2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537").isDefined() ; + /// "2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537").isDefined(); /// // True /// @endcode /// @@ -114,7 +114,7 @@ class TLE /// TLE("ISS (ZARYA)", /// "1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 2927", /// "2 25544 51.6416 247.4627 0006703 130.5360 - /// 325.0288 15.72125391563537").getSatelliteName() ; // "ISS (ZARYA)" + /// 325.0288 15.72125391563537").getSatelliteName(); // "ISS (ZARYA)" /// @endcode /// /// @return Satellite name @@ -126,7 +126,7 @@ class TLE /// TLE("ISS (ZARYA)", /// "1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 2927", /// "2 25544 51.6416 247.4627 0006703 130.5360 - /// 325.0288 15.72125391563537").getSatelliteName() ; // "1 25544U 98067A 08264.51782528 + /// 325.0288 15.72125391563537").getSatelliteName(); // "1 25544U 98067A 08264.51782528 /// -.00002182 00000-0 -11606-4 0 2927" /// @endcode /// @@ -139,7 +139,7 @@ class TLE /// TLE("ISS (ZARYA)", /// "1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 2927", /// "2 25544 51.6416 247.4627 0006703 130.5360 - /// 325.0288 15.72125391563537").getSatelliteName() ; // "2 25544 51.6416 247.4627 0006703 + /// 325.0288 15.72125391563537").getSatelliteName(); // "2 25544 51.6416 247.4627 0006703 /// 130.5360 325.0288 15.72125391563537" /// @endcode /// @@ -258,7 +258,7 @@ class TLE /// @brief Constructs an undefined TLE /// /// @code{.cpp} - /// TLE tle = TLE::Undefined() ; // Undefined + /// TLE tle = TLE::Undefined(); // Undefined /// @endcode /// /// @return Undefined TLE @@ -268,7 +268,7 @@ class TLE /// /// @code{.cpp} /// TLE::CanParse("1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 2927\n - /// 2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537") ; // + /// 2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537"); // /// True /// @endcode /// @@ -280,7 +280,7 @@ class TLE /// /// @code{.cpp} /// TLE::CanParse("1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 2927", - /// "2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537") ; // + /// "2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.72125391563537"); // /// True /// @endcode /// @@ -294,7 +294,7 @@ class TLE /// @code{.cpp} /// TLE tle = TLE::Parse("1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 2927\n /// 2 25544 51.6416 247.4627 0006703 130.5360 - /// 325.0288 15.72125391563537") ; + /// 325.0288 15.72125391563537"); /// @endcode /// /// @param aString A string @@ -304,7 +304,7 @@ class TLE /// @brief Load a TLE from a given file /// /// @code{.cpp} - /// TLE tle = TLE::File(File::Path(Path::String("/path/to/file.tle"))) ; + /// TLE tle = TLE::File(File::Path(Path::String("/path/to/file.tle"))); /// @endcode /// /// @param aFile A file @@ -357,7 +357,7 @@ class TLE /// /// @code{.cpp} /// TLE::GenerateChecksum("1 25544U 98067A 08264.51782528 -.00002182 00000-0 -11606-4 0 - /// 2927") ; + /// 2927"); /// @endcode /// /// @param aLine A TLE line diff --git a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Propagator.hpp b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Propagator.hpp index 8bd2d73c3..846ce7bc2 100644 --- a/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Propagator.hpp +++ b/include/OpenSpaceToolkit/Astrodynamics/Trajectory/Propagator.hpp @@ -55,7 +55,7 @@ class Propagator /// @brief Constructor /// /// @code{.cpp} - /// Propagator propagator = { aNumericalSolver, aDynamicsArray } ; + /// Propagator propagator = { aNumericalSolver, aDynamicsArray }; /// @endcode /// /// @param aNumericalSolver A numerical solver @@ -68,7 +68,7 @@ class Propagator /// @brief Constructor with Maneuvers /// /// @code{.cpp} - /// Propagator propagator = { aNumericalSolver, aDynamicsArray, aManeuverArray } ; + /// Propagator propagator = { aNumericalSolver, aDynamicsArray, aManeuverArray }; /// @endcode /// /// @param aNumericalSolver A numerical solver diff --git a/src/OpenSpaceToolkit/Astrodynamics/Access/Generator.cpp b/src/OpenSpaceToolkit/Astrodynamics/Access/Generator.cpp index 85d383505..ac72c30b9 100644 --- a/src/OpenSpaceToolkit/Astrodynamics/Access/Generator.cpp +++ b/src/OpenSpaceToolkit/Astrodynamics/Access/Generator.cpp @@ -224,15 +224,15 @@ Generator Generator::AerRanges( const Interval elevationRange_deg = anElevationRange; const Interval rangeRange_m = aRangeRange; - // const Interval azimuthRange_deg = anAzimuthRange ; // anAzimuthRange.isDefined() ? + // const Interval azimuthRange_deg = anAzimuthRange; // anAzimuthRange.isDefined() ? // Interval(anAzimuthRange.accessLowerBound().inDegrees(0.0, +360.0), // anAzimuthRange.accessUpperBound().inDegrees(0.0, +360.0), anAzimuthRange.getType()) : Interval::Undefined() - // ; const Interval elevationRange_deg = anElevationRange ; // anElevationRange.isDefined() ? + //; const Interval elevationRange_deg = anElevationRange; // anElevationRange.isDefined() ? // Interval(anElevationRange.accessLowerBound().inDegrees(-180.0, +180.0), // anElevationRange.accessUpperBound().inDegrees(-180.0, +180.0), anElevationRange.getType()) : - // Interval::Undefined() ; const Interval rangeRange_m = aRangeRange ; // aRangeRange.isDefined() ? + // Interval::Undefined(); const Interval rangeRange_m = aRangeRange; // aRangeRange.isDefined() ? // Interval(aRangeRange.accessLowerBound().inMeters(), aRangeRange.accessUpperBound().inMeters(), - // aRangeRange.getType()) : Interval::Undefined() ; + // aRangeRange.getType()) : Interval::Undefined(); const std::function aerFilter = [azimuthRange_deg, elevationRange_deg, rangeRange_m](const AER& anAER) -> bool diff --git a/src/OpenSpaceToolkit/Astrodynamics/Trajectory.cpp b/src/OpenSpaceToolkit/Astrodynamics/Trajectory.cpp index e8a450234..f98618ec8 100644 --- a/src/OpenSpaceToolkit/Astrodynamics/Trajectory.cpp +++ b/src/OpenSpaceToolkit/Astrodynamics/Trajectory.cpp @@ -70,7 +70,7 @@ const Model& Trajectory::accessModel() const { // if (!this->isDefined()) // { - // throw ostk::core::error::runtime::Undefined("Trajectory") ; + // throw ostk::core::error::runtime::Undefined("Trajectory"); // } if (modelUPtr_ == nullptr) diff --git a/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler.cpp b/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler.cpp index 29ef5549f..993564008 100644 --- a/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler.cpp +++ b/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler.cpp @@ -533,7 +533,7 @@ Integer Kepler::CalculateJ2RevolutionNumberAt( // std::cout << "T0 = " << aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter).toString() << " == // " << aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter).inSeconds().toString() << " [s]" << - // std::endl ; + // std::endl; Duration orbitalPeriod = Duration::Undefined(); @@ -546,25 +546,25 @@ Integer Kepler::CalculateJ2RevolutionNumberAt( // if (e > 0.1) // { // throw ostk::core::error::runtime::ToBeImplemented("Kepler::CalculateJ2RevolutionNumberAt -> Only - // near-circular orbits are supported.") ; + // near-circular orbits are supported."); // } - // const Real w_rad = aClassicalOrbitalElementSet.getAop().inRadians() ; + // const Real w_rad = aClassicalOrbitalElementSet.getAop().inRadians(); - // const Real sin_i = std::sin(i_rad) ; - // const Real sin_i_2 = sin_i * sin_i ; + // const Real sin_i = std::sin(i_rad); + // const Real sin_i_2 = sin_i * sin_i; // const Real correctionFactor = 1.0 // - ((3.0 * aJ2 * (4.0 - 5.0 * sin_i_2)) / (4.0 * std::pow(a_m / R_m, 2) * // std::sqrt(1.0 - e * e) * std::pow(1.0 + e * std::cos(w_rad), 2))) // - ((3.0 * aJ2 * std::pow(1.0 - e * std::cos(w_rad), 3)) / (2.0 * std::pow(a_m / - // R_m, 2) * std::pow(1.0 - e * e, 3))) ; + // R_m, 2) * std::pow(1.0 - e * e, 3))); - // orbitalPeriod = aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter) * correctionFactor ; + // orbitalPeriod = aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter) * correctionFactor; // std::cout << "B - T = " << orbitalPeriod.toString() << " == " << orbitalPeriod.inSeconds().toString() << " - // [s]" << std::endl ; std::cout << "A - DT = " << (orbitalPeriod - - // aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter)).toString() << std::endl ; + // [s]" << std::endl; std::cout << "A - DT = " << (orbitalPeriod - + // aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter)).toString() << std::endl; // } @@ -572,50 +572,50 @@ Integer Kepler::CalculateJ2RevolutionNumberAt( // // https://www.mathworks.com/matlabcentral/fileexchange/39550-orbital-periods-of-a-satellite - // using ostk::physics::unit::Mass ; - // using ostk::physics::unit::Time ; - // using ostk::physics::unit::Derived ; - // using ostk::physics::unit::Angle ; + // using ostk::physics::unit::Mass; + // using ostk::physics::unit::Time; + // using ostk::physics::unit::Derived; + // using ostk::physics::unit::Angle; - // const Real a_m = aClassicalOrbitalElementSet.getSemiMajorAxis().inMeters() ; - // const Real ecc = aClassicalOrbitalElementSet.getEccentricity() ; - // const Real inc = aClassicalOrbitalElementSet.getInclination().inRadians() ; - // const Real argper = aClassicalOrbitalElementSet.getAop().inRadians() ; + // const Real a_m = aClassicalOrbitalElementSet.getSemiMajorAxis().inMeters(); + // const Real ecc = aClassicalOrbitalElementSet.getEccentricity(); + // const Real inc = aClassicalOrbitalElementSet.getInclination().inRadians(); + // const Real argper = aClassicalOrbitalElementSet.getAop().inRadians(); // static const Derived::Unit gravitationalParameterSIUnit = { Length::Unit::Meter, Derived::Order(3), // Mass::Unit::Undefined, Derived::Order::Zero(), Time::Unit::Second, Derived::Order(-2), - // Angle::Unit::Undefined, Derived::Order::Zero() } ; + // Angle::Unit::Undefined, Derived::Order::Zero() }; - // const Real gravitationalParameter_SI = aGravitationalParameter.in(gravitationalParameterSIUnit) ; + // const Real gravitationalParameter_SI = aGravitationalParameter.in(gravitationalParameterSIUnit); - // const double sma = a_m ; - // const double mu = gravitationalParameter_SI ; - // const double req = R_m ; - // const double j2 = aJ2 ; + // const double sma = a_m; + // const double mu = gravitationalParameter_SI; + // const double req = R_m; + // const double j2 = aJ2; - // const double tkepler = 2.0 * M_PI * sma * std::sqrt(sma / mu) ; - // const double mm = 2.0 * M_PI / tkepler ; + // const double tkepler = 2.0 * M_PI * sma * std::sqrt(sma / mu); + // const double mm = 2.0 * M_PI / tkepler; - // const double slr = sma * (1.0 - ecc * ecc) ; + // const double slr = sma * (1.0 - ecc * ecc); - // const double b = std::sqrt(1.0 - ecc * ecc) ; - // const double c = req / slr ; - // const double d = c * c ; - // const double e = std::sin(inc) * std::sin(inc) ; + // const double b = std::sqrt(1.0 - ecc * ecc); + // const double c = req / slr; + // const double d = c * c; + // const double e = std::sin(inc) * std::sin(inc); // const double pmm = mm * (1.0 + 1.5 * j2 * d * std::sqrt(1.0 - ecc * ecc) * (1.0 - 1.5 * e)); - // const double ar = (sma / req) * (sma / req) ; - // const double ep = 1.0 - ecc * ecc ; - // const double sw = std::sin(argper) ; - // const double pp = 1.0 + ecc * std::cos(argper) ; + // const double ar = (sma / req) * (sma / req); + // const double ep = 1.0 - ecc * ecc; + // const double sw = std::sin(argper); + // const double pp = 1.0 + ecc * std::cos(argper); - // const double a = -0.75 * j2 * (4.0 - 5.0 * e) / (ar * std::sqrt(ep) * pp * pp) ; - // const double bb = -1.5 * j2 * pp * pp * pp / (ar * ep * ep * ep) ; + // const double a = -0.75 * j2 * (4.0 - 5.0 * e) / (ar * std::sqrt(ep) * pp * pp); + // const double bb = -1.5 * j2 * pp * pp * pp / (ar * ep * ep * ep); - // const double tnodal = tkepler * (1.0 + a + bb) ; + // const double tnodal = tkepler * (1.0 + a + bb); - // std::cout << "tnodal = " << tnodal << std::endl ; + // std::cout << "tnodal = " << tnodal << std::endl; // } @@ -624,20 +624,20 @@ Integer Kepler::CalculateJ2RevolutionNumberAt( // // // https://books.google.com/books?id=tLU-wjQktoMC&pg=PA50&lpg=PA50&dq=draconic+period+j2&source=bl&ots=GF-KGM4jIr&sig=NG77REHR3SpC4FhRLpX8AfoeBAo&hl=en&sa=X&ved=2ahUKEwia5YTd6L3cAhUDKnwKHfSoCwEQ6AEwAnoECAQQAQ#v=onepage&q=draconic%20period%20j2&f=false - // const double T_0 = aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter).inSeconds() ; + // const double T_0 = aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter).inSeconds(); - // const double n_0 = Real::TwoPi() / T_0 ; + // const double n_0 = Real::TwoPi() / T_0; // const double n = n_0 - (3.0 / 4.0) * n_0 * aJ2 * std::pow(R_m / a_m, 2) * (1.0 - 3.0 * std::cos(i_rad) * - // std::cos(i_rad)) ; const double w_dot = - (3.0 / 4.0) * n_0 * aJ2 * std::pow(R_m / a_m, 2) * (1.0 - 5.0 * - // std::cos(i_rad) * std::cos(i_rad)) ; + // std::cos(i_rad)); const double w_dot = - (3.0 / 4.0) * n_0 * aJ2 * std::pow(R_m / a_m, 2) * (1.0 - 5.0 * + // std::cos(i_rad) * std::cos(i_rad)); - // const double T = Real::TwoPi() / (n + w_dot) ; + // const double T = Real::TwoPi() / (n + w_dot); - // orbitalPeriod = Duration::Seconds(T) ; + // orbitalPeriod = Duration::Seconds(T); // std::cout << "B - T = " << orbitalPeriod.toString() << " == " << orbitalPeriod.inSeconds().toString() << " - // [s]" << std::endl ; std::cout << "B - DT = " << (orbitalPeriod - - // aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter)).toString() << std::endl ; + // [s]" << std::endl; std::cout << "B - DT = " << (orbitalPeriod - + // aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter)).toString() << std::endl; // } @@ -657,8 +657,8 @@ Integer Kepler::CalculateJ2RevolutionNumberAt( orbitalPeriod = Duration::Seconds(T); // std::cout << "B - T = " << orbitalPeriod.toString() << " == " << orbitalPeriod.inSeconds().toString() << " - // [s]" << std::endl ; std::cout << "B - DT = " << (orbitalPeriod - - // aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter)).toString() << std::endl ; + // [s]" << std::endl; std::cout << "B - DT = " << (orbitalPeriod - + // aClassicalOrbitalElementSet.getOrbitalPeriod(aGravitationalParameter)).toString() << std::endl; } const Duration durationFromEpoch = Duration::Between(anEpoch, anInstant); diff --git a/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4.cpp b/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4.cpp index 4d551af09..1ba6c3248 100644 --- a/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4.cpp +++ b/src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4.cpp @@ -193,7 +193,7 @@ void SGP4::print(std::ostream& anOutputStream, bool displayDecorator) const ostk::core::utils::Print::Separator(anOutputStream, "Two-Line Elements"); - // tle_.print(anOutputStream, false) ; + // tle_.print(anOutputStream, false); displayDecorator ? ostk::core::utils::Print::Footer(anOutputStream) : void(); } diff --git a/test/OpenSpaceToolkit/Astrodynamics/Access/Generator.test.cpp b/test/OpenSpaceToolkit/Astrodynamics/Access/Generator.test.cpp index 63b80cb84..134761821 100644 --- a/test/OpenSpaceToolkit/Astrodynamics/Access/Generator.test.cpp +++ b/test/OpenSpaceToolkit/Astrodynamics/Access/Generator.test.cpp @@ -802,7 +802,7 @@ TEST(OpenSpaceToolkit_Astrodynamics_Access_Generator, AerRanges) const Orbit satelliteOrbit = generateSatelliteOrbit(); const Array accesses = generator.computeAccesses(interval, groundStationTrajectory, satelliteOrbit); - // std::cout << accesses << std::endl ; + // std::cout << accesses << std::endl; // Reference data setup @@ -826,7 +826,7 @@ TEST(OpenSpaceToolkit_Astrodynamics_Access_Generator, AerRanges) const Instant reference_acquisitionOfSignal = Instant::DateTime(DateTime::Parse(referenceRow[0].accessString()), Scale::UTC); // const Instant reference_timeOfClosestApproach = - // Instant::DateTime(DateTime::Parse(referenceRow[1].accessString()), Scale::UTC) ; + // Instant::DateTime(DateTime::Parse(referenceRow[1].accessString()), Scale::UTC); const Instant reference_lossOfSignal = Instant::DateTime(DateTime::Parse(referenceRow[2].accessString()), Scale::UTC); const Duration reference_duration = Duration::Seconds(referenceRow[3].accessReal()); @@ -837,7 +837,7 @@ TEST(OpenSpaceToolkit_Astrodynamics_Access_Generator, AerRanges) ); // EXPECT_TRUE(access.getTimeOfClosestApproach().isNear(reference_timeOfClosestApproach, toleranceDuration)) // << String::Format("{} ~ {}", reference_timeOfClosestApproach.toString(), - // access.getTimeOfClosestApproach().toString()) ; + // access.getTimeOfClosestApproach().toString()); EXPECT_TRUE(access.getLossOfSignal().isNear(reference_lossOfSignal, toleranceDuration)) << String::Format("{} ~ {}", reference_lossOfSignal.toString(), access.getLossOfSignal().toString()); EXPECT_TRUE(access.getDuration().isNear(reference_duration, toleranceDuration)) @@ -908,7 +908,7 @@ TEST(OpenSpaceToolkit_Astrodynamics_Access_Generator, AerMask) const Orbit satelliteOrbit = generateSatelliteOrbit(); const Array accesses = generator.computeAccesses(interval, groundStationTrajectory, satelliteOrbit); - // std::cout << accesses << std::endl ; + // std::cout << accesses << std::endl; // Reference data setup @@ -931,7 +931,7 @@ TEST(OpenSpaceToolkit_Astrodynamics_Access_Generator, AerMask) const Instant reference_acquisitionOfSignal = Instant::DateTime(DateTime::Parse(referenceRow[0].accessString()), Scale::UTC); // const Instant reference_timeOfClosestApproach = - // Instant::DateTime(DateTime::Parse(referenceRow[1].accessString()), Scale::UTC) ; + // Instant::DateTime(DateTime::Parse(referenceRow[1].accessString()), Scale::UTC); const Instant reference_lossOfSignal = Instant::DateTime(DateTime::Parse(referenceRow[2].accessString()), Scale::UTC); const Duration reference_duration = Duration::Seconds(referenceRow[3].accessReal()); @@ -942,7 +942,7 @@ TEST(OpenSpaceToolkit_Astrodynamics_Access_Generator, AerMask) ); // EXPECT_TRUE(access.getTimeOfClosestApproach().isNear(reference_timeOfClosestApproach, toleranceDuration)) // << String::Format("{} ~ {}", reference_timeOfClosestApproach.toString(), - // access.getTimeOfClosestApproach().toString()) ; + // access.getTimeOfClosestApproach().toString()); EXPECT_TRUE(access.getLossOfSignal().isNear(reference_lossOfSignal, toleranceDuration)) << String::Format("{} ~ {}", reference_lossOfSignal.toString(), access.getLossOfSignal().toString()); EXPECT_TRUE(access.getDuration().isNear(reference_duration, toleranceDuration)) diff --git a/test/OpenSpaceToolkit/Astrodynamics/Conjunction/Message/CCSDS/CDM.test.cpp b/test/OpenSpaceToolkit/Astrodynamics/Conjunction/Message/CCSDS/CDM.test.cpp index 2759ada12..0e87b3eb1 100644 --- a/test/OpenSpaceToolkit/Astrodynamics/Conjunction/Message/CCSDS/CDM.test.cpp +++ b/test/OpenSpaceToolkit/Astrodynamics/Conjunction/Message/CCSDS/CDM.test.cpp @@ -193,8 +193,8 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Conjunction_Message_CCSDS_CDM, GetRelative EXPECT_EQ(String::Empty(), relativeMetadata.comment); EXPECT_EQ(Instant::DateTime(DateTime(2010, 3, 13, 22, 37, 52, 618), Scale::UTC), relativeMetadata.TCA); EXPECT_EQ(Length::Meters(715.0), relativeMetadata.missDistance); - // EXPECT_EQ(Position::Undefined(), relativeMetadata.relativePosition) ; - // EXPECT_EQ(Velocity::Undefined(), relativeMetadata.relativeVelocity) ; + // EXPECT_EQ(Position::Undefined(), relativeMetadata.relativePosition); + // EXPECT_EQ(Velocity::Undefined(), relativeMetadata.relativeVelocity); EXPECT_EQ( Instant::DateTime(DateTime(2010, 3, 12, 18, 29, 32, 212), Scale::UTC), relativeMetadata.startScreenPeriod ); @@ -301,15 +301,15 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Conjunction_Message_CCSDS_CDM, GetObjectDa EXPECT_EQ(97.8, objectData.residualsAccepted); EXPECT_EQ(0.864, objectData.weightedRMS); EXPECT_EQ(5.2, objectData.areaPC); - // EXPECT_EQ(Real::Undefined(), objectData.areaDrag) ; - // EXPECT_EQ(Real::Undefined(), objectData.areaSRP) ; + // EXPECT_EQ(Real::Undefined(), objectData.areaDrag); + // EXPECT_EQ(Real::Undefined(), objectData.areaSRP); EXPECT_EQ(Mass::Kilograms(251.6), objectData.mass); EXPECT_EQ(0.045663, objectData.cdAreaOverMass); EXPECT_EQ(0.0, objectData.crAreaOverMass); EXPECT_EQ(0.0, objectData.thrustAcceleration); EXPECT_EQ(0.000045457, objectData.SEDR); - // EXPECT_EQ(State::Undefined(), objectData.state ) ; - // EXPECT_EQ(MatrixXd(9, 9), objectData.covarianceMatrix ) ; + // EXPECT_EQ(State::Undefined(), objectData.state ); + // EXPECT_EQ(MatrixXd(9, 9), objectData.covarianceMatrix ); } { @@ -407,13 +407,13 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Conjunction_Message_CCSDS_CDM, GetMissDist // { -// EXPECT_EQ(Length.Meters(715.0), this->cdm_.getRelativePosition()) ; +// EXPECT_EQ(Length.Meters(715.0), this->cdm_.getRelativePosition()); // } // { -// EXPECT_ANY_THROW(CDM::Undefined().getRelativePosition()) ; +// EXPECT_ANY_THROW(CDM::Undefined().getRelativePosition()); // } @@ -424,13 +424,13 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Conjunction_Message_CCSDS_CDM, GetMissDist // { -// EXPECT_EQ(Length.Meters(715.0), this->cdm_.getRelativeVelocity()) ; +// EXPECT_EQ(Length.Meters(715.0), this->cdm_.getRelativeVelocity()); // } // { -// EXPECT_ANY_THROW(CDM::Undefined().getRelativeVelocity()) ; +// EXPECT_ANY_THROW(CDM::Undefined().getRelativeVelocity()); // } @@ -551,13 +551,13 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Conjunction_Message_CCSDS_CDM, GetObjectRe // { -// EXPECT_EQ("EME2000", this->cdm_.getObjectStateAtTCA(1)) ; +// EXPECT_EQ("EME2000", this->cdm_.getObjectStateAtTCA(1)); // } // { -// EXPECT_ANY_THROW(CDM::Undefined().getObjectStateAtTCA(1)) ; +// EXPECT_ANY_THROW(CDM::Undefined().getObjectStateAtTCA(1)); // } @@ -568,13 +568,13 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Conjunction_Message_CCSDS_CDM, GetObjectRe // { -// EXPECT_EQ("EME2000", this->cdm_.getObjectCovarianceMatrix(1)) ; +// EXPECT_EQ("EME2000", this->cdm_.getObjectCovarianceMatrix(1)); // } // { -// EXPECT_ANY_THROW(CDM::Undefined().getObjectCovarianceMatrix(1)) ; +// EXPECT_ANY_THROW(CDM::Undefined().getObjectCovarianceMatrix(1)); // } diff --git a/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler.test.cpp b/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler.test.cpp index 6f44634dd..54e7c3fd7 100644 --- a/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler.test.cpp +++ b/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler.test.cpp @@ -55,76 +55,76 @@ using ostk::astrodynamics::trajectory::State; // TEST (OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler, Constructor) // { -// using ostk::core::type::Shared ; -// using ostk::core::type::Real ; -// using ostk::core::container::Array ; -// using ostk::core::container::Table ; -// using ostk::core::filesystem::Path ; -// using ostk::core::filesystem::File ; - -// using ostk::mathematics::object::Vector3d ; - -// using ostk::physics::unit::Length ; -// using ostk::physics::unit::Angle ; -// using ostk::physics::unit::Derived ; -// using ostk::physics::time::Scale ; -// using ostk::physics::time::Instant ; -// using ostk::physics::time::Duration ; -// using ostk::physics::time::Interval ; -// using ostk::physics::time::DateTime ; -// using ostk::physics::coordinate::Frame ; -// using ostk::physics::coordinate::Position ; -// using ostk::physics::coordinate::Velocity ; -// using ostk::physics::environment::object::celestial::Earth ; - -// using ostk::astrodynamics::trajectory::Orbit ; -// using ostk::astrodynamics::trajectory::State ; -// using ostk::astrodynamics::trajectory::orbit::model::Kepler ; -// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE ; +// using ostk::core::type::Shared; +// using ostk::core::type::Real; +// using ostk::core::container::Array; +// using ostk::core::container::Table; +// using ostk::core::filesystem::Path; +// using ostk::core::filesystem::File; + +// using ostk::mathematics::object::Vector3d; + +// using ostk::physics::unit::Length; +// using ostk::physics::unit::Angle; +// using ostk::physics::unit::Derived; +// using ostk::physics::time::Scale; +// using ostk::physics::time::Instant; +// using ostk::physics::time::Duration; +// using ostk::physics::time::Interval; +// using ostk::physics::time::DateTime; +// using ostk::physics::coordinate::Frame; +// using ostk::physics::coordinate::Position; +// using ostk::physics::coordinate::Velocity; +// using ostk::physics::environment::object::celestial::Earth; + +// using ostk::astrodynamics::trajectory::Orbit; +// using ostk::astrodynamics::trajectory::State; +// using ostk::astrodynamics::trajectory::orbit::model::Kepler; +// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE; // // { -// // const Earth earth = Earth::Analytical() ; +// // const Earth earth = Earth::Analytical(); -// // const Length semiMajorAxis = Length::Kilometers(7000.0) ; -// // const Real eccentricity = 0.0 ; -// // const Angle inclination = Angle::Degrees(0.0) ; -// // const Angle raan = Angle::Degrees(0.0) ; -// // const Angle aop = Angle::Degrees(0.0) ; -// // const Angle trueAnomaly = Angle::Degrees(0.0) ; +// // const Length semiMajorAxis = Length::Kilometers(7000.0); +// // const Real eccentricity = 0.0; +// // const Angle inclination = Angle::Degrees(0.0); +// // const Angle raan = Angle::Degrees(0.0); +// // const Angle aop = Angle::Degrees(0.0); +// // const Angle trueAnomaly = Angle::Degrees(0.0); -// // const COE coe = { semiMajorAxis, eccentricity, inclination, raan, aop, trueAnomaly } ; +// // const COE coe = { semiMajorAxis, eccentricity, inclination, raan, aop, trueAnomaly }; -// // std::cout << coe << std::endl ; +// // std::cout << coe << std::endl; -// // const Instant epoch = Instant::DateTime(DateTime::Parse("2018-01-01 00:00:00"), Scale::UTC) ; +// // const Instant epoch = Instant::DateTime(DateTime::Parse("2018-01-01 00:00:00"), Scale::UTC); -// // const Kepler keplerianModel = { coe, epoch, earth, Kepler::PerturbationType::None } ; +// // const Kepler keplerianModel = { coe, epoch, earth, Kepler::PerturbationType::None }; -// // std::cout << keplerianModel.getClassicalOrbitalElements() << std::endl ; +// // std::cout << keplerianModel.getClassicalOrbitalElements() << std::endl; // // } // { -// const Earth earth = Earth::Analytical() ; +// const Earth earth = Earth::Analytical(); -// const Length semiMajorAxis = Length::Kilometers(7000.0) ; -// const Real eccentricity = 0.0 ; -// const Angle inclination = Angle::Degrees(0.0) ; -// const Angle raan = Angle::Degrees(0.0) ; -// const Angle aop = Angle::Degrees(0.0) ; -// const Angle trueAnomaly = Angle::Degrees(0.0) ; +// const Length semiMajorAxis = Length::Kilometers(7000.0); +// const Real eccentricity = 0.0; +// const Angle inclination = Angle::Degrees(0.0); +// const Angle raan = Angle::Degrees(0.0); +// const Angle aop = Angle::Degrees(0.0); +// const Angle trueAnomaly = Angle::Degrees(0.0); -// const COE coe = { semiMajorAxis, eccentricity, inclination, raan, aop, trueAnomaly } ; +// const COE coe = { semiMajorAxis, eccentricity, inclination, raan, aop, trueAnomaly }; -// std::cout << coe << std::endl ; +// std::cout << coe << std::endl; -// const Instant epoch = Instant::DateTime(DateTime::Parse("2018-01-01 00:00:00"), Scale::UTC) ; +// const Instant epoch = Instant::DateTime(DateTime::Parse("2018-01-01 00:00:00"), Scale::UTC); -// const Kepler keplerianModel = { coe, epoch, earth, Kepler::PerturbationType::None, true } ; +// const Kepler keplerianModel = { coe, epoch, earth, Kepler::PerturbationType::None, true }; -// std::cout << keplerianModel.getClassicalOrbitalElements() << std::endl ; +// std::cout << keplerianModel.getClassicalOrbitalElements() << std::endl; // } @@ -237,22 +237,22 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler, Test_1) ASSERT_EQ(referenceRevolutionNumber.floor(), orbit.getRevolutionNumberAt(instant)); // std::cout << "x @ GCRF = " << referencePosition_GCRF.toString(10) << " / " << - // position_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "x @ ITRF = " << + // position_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "x @ ITRF = " << // referencePosition_ITRF.toString(10) << " / " << position_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() - // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() + // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl; // std::cout << "v @ GCRF = " << referenceVelocity_GCRF.toString(10) << " / " << - // velocity_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "v @ ITRF = " << + // velocity_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "v @ ITRF = " << // referenceVelocity_ITRF.toString(10) << " / " << velocity_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() - // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() + // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl; // std::cout << "dx | dv = " << Real((position_GCRF.accessCoordinates() - // referencePosition_GCRF).norm()).toString(12) << " - " << Real((position_ITRF.accessCoordinates() - // referencePosition_ITRF).norm()).toString(12) << " | " << Real((velocity_GCRF.accessCoordinates() - // referenceVelocity_GCRF).norm()).toString(12) << " - " << Real((velocity_ITRF.accessCoordinates() - - // referenceVelocity_ITRF).norm()).toString(12) << std::endl ; + // referenceVelocity_ITRF).norm()).toString(12) << std::endl; } } } @@ -355,22 +355,22 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler, Test_2) } // std::cout << "x @ GCRF = " << referencePosition_GCRF.toString(10) << " / " << - // position_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "x @ ITRF = " << + // position_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "x @ ITRF = " << // referencePosition_ITRF.toString(10) << " / " << position_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() - // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() + // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl; // std::cout << "v @ GCRF = " << referenceVelocity_GCRF.toString(10) << " / " << - // velocity_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "v @ ITRF = " << + // velocity_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "v @ ITRF = " << // referenceVelocity_ITRF.toString(10) << " / " << velocity_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() - // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() + // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl; // std::cout << "dx | dv = " << Real((position_GCRF.accessCoordinates() - // referencePosition_GCRF).norm()).toString(12) << " - " << Real((position_ITRF.accessCoordinates() - // referencePosition_ITRF).norm()).toString(12) << " | " << Real((velocity_GCRF.accessCoordinates() - // referenceVelocity_GCRF).norm()).toString(12) << " - " << Real((velocity_ITRF.accessCoordinates() - - // referenceVelocity_ITRF).norm()).toString(12) << std::endl ; + // referenceVelocity_ITRF).norm()).toString(12) << std::endl; } } } @@ -462,22 +462,22 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler, Test_3) ASSERT_GT(1e-2, (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm()); // std::cout << "x @ GCRF = " << referencePosition_GCRF.toString(10) << " / " << - // position_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "x @ ITRF = " << + // position_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "x @ ITRF = " << // referencePosition_ITRF.toString(10) << " / " << position_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() - // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() + // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl; // std::cout << "v @ GCRF = " << referenceVelocity_GCRF.toString(10) << " / " << - // velocity_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "v @ ITRF = " << + // velocity_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "v @ ITRF = " << // referenceVelocity_ITRF.toString(10) << " / " << velocity_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() - // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() + // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl; // std::cout << "dx | dv = " << Real((position_GCRF.accessCoordinates() - // referencePosition_GCRF).norm()).toString(12) << " - " << Real((position_ITRF.accessCoordinates() - // referencePosition_ITRF).norm()).toString(12) << " | " << Real((velocity_GCRF.accessCoordinates() - // referenceVelocity_GCRF).norm()).toString(12) << " - " << Real((velocity_ITRF.accessCoordinates() - - // referenceVelocity_ITRF).norm()).toString(12) << std::endl ; + // referenceVelocity_ITRF).norm()).toString(12) << std::endl; } } } @@ -569,22 +569,22 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler, Test_4) ASSERT_GT(1e-3, (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm()); // std::cout << "x @ GCRF = " << referencePosition_GCRF.toString(10) << " / " << - // position_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "x @ ITRF = " << + // position_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "x @ ITRF = " << // referencePosition_ITRF.toString(10) << " / " << position_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() - // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() + // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl; // std::cout << "v @ GCRF = " << referenceVelocity_GCRF.toString(10) << " / " << - // velocity_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "v @ ITRF = " << + // velocity_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "v @ ITRF = " << // referenceVelocity_ITRF.toString(10) << " / " << velocity_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() - // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() + // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl; // std::cout << "dx | dv = " << Real((position_GCRF.accessCoordinates() - // referencePosition_GCRF).norm()).toString(12) << " - " << Real((position_ITRF.accessCoordinates() - // referencePosition_ITRF).norm()).toString(12) << " | " << Real((velocity_GCRF.accessCoordinates() - // referenceVelocity_GCRF).norm()).toString(12) << " - " << Real((velocity_ITRF.accessCoordinates() - - // referenceVelocity_ITRF).norm()).toString(12) << std::endl ; + // referenceVelocity_ITRF).norm()).toString(12) << std::endl; } } } @@ -676,22 +676,22 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler, Test_5) ASSERT_GT(5e-3, (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm()); // std::cout << "x @ GCRF = " << referencePosition_GCRF.toString(10) << " / " << - // position_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "x @ ITRF = " << + // position_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "x @ ITRF = " << // referencePosition_ITRF.toString(10) << " / " << position_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() - // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() + // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl; // std::cout << "v @ GCRF = " << referenceVelocity_GCRF.toString(10) << " / " << - // velocity_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "v @ ITRF = " << + // velocity_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "v @ ITRF = " << // referenceVelocity_ITRF.toString(10) << " / " << velocity_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() - // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() + // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl; // std::cout << "dx | dv = " << Real((position_GCRF.accessCoordinates() - // referencePosition_GCRF).norm()).toString(12) << " - " << Real((position_ITRF.accessCoordinates() - // referencePosition_ITRF).norm()).toString(12) << " | " << Real((velocity_GCRF.accessCoordinates() - // referenceVelocity_GCRF).norm()).toString(12) << " - " << Real((velocity_ITRF.accessCoordinates() - - // referenceVelocity_ITRF).norm()).toString(12) << std::endl ; + // referenceVelocity_ITRF).norm()).toString(12) << std::endl; } } } @@ -783,22 +783,22 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler, Test_6) ASSERT_GT(5e-3, (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm()); // std::cout << "x @ GCRF = " << referencePosition_GCRF.toString(10) << " / " << - // position_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "x @ ITRF = " << + // position_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "x @ ITRF = " << // referencePosition_ITRF.toString(10) << " / " << position_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() - // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() + // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl; // std::cout << "v @ GCRF = " << referenceVelocity_GCRF.toString(10) << " / " << - // velocity_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "v @ ITRF = " << + // velocity_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "v @ ITRF = " << // referenceVelocity_ITRF.toString(10) << " / " << velocity_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() - // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() + // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl; // std::cout << "dx | dv = " << Real((position_GCRF.accessCoordinates() - // referencePosition_GCRF).norm()).toString(12) << " - " << Real((position_ITRF.accessCoordinates() - // referencePosition_ITRF).norm()).toString(12) << " | " << Real((velocity_GCRF.accessCoordinates() - // referenceVelocity_GCRF).norm()).toString(12) << " - " << Real((velocity_ITRF.accessCoordinates() - - // referenceVelocity_ITRF).norm()).toString(12) << std::endl ; + // referenceVelocity_ITRF).norm()).toString(12) << std::endl; } } } diff --git a/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.test.cpp b/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.test.cpp index b11ca4c7f..34138e301 100644 --- a/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.test.cpp +++ b/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.test.cpp @@ -343,23 +343,23 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, Compute // TEST (OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, GetMeanAnomaly) // { -// using ostk::core::type::Real ; +// using ostk::core::type::Real; -// using ostk::mathematics::object::Vector3d ; +// using ostk::mathematics::object::Vector3d; -// using ostk::physics::unit::Length ; -// using ostk::physics::unit::Angle ; -// using ostk::physics::unit::Derived ; -// using ostk::physics::time::Duration ; -// using ostk::physics::coordinate::Position ; -// using ostk::physics::coordinate::Velocity ; -// using ostk::physics::environment::object::celestial::Earth ; +// using ostk::physics::unit::Length; +// using ostk::physics::unit::Angle; +// using ostk::physics::unit::Derived; +// using ostk::physics::time::Duration; +// using ostk::physics::coordinate::Position; +// using ostk::physics::coordinate::Velocity; +// using ostk::physics::environment::object::celestial::Earth; -// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE ; +// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE; // { -// FAIL() ; +// FAIL(); // } @@ -368,23 +368,23 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, Compute // TEST (OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, GetEccentricAnomaly) // { -// using ostk::core::type::Real ; +// using ostk::core::type::Real; -// using ostk::mathematics::object::Vector3d ; +// using ostk::mathematics::object::Vector3d; -// using ostk::physics::unit::Length ; -// using ostk::physics::unit::Angle ; -// using ostk::physics::unit::Derived ; -// using ostk::physics::time::Duration ; -// using ostk::physics::coordinate::Position ; -// using ostk::physics::coordinate::Velocity ; -// using ostk::physics::environment::object::celestial::Earth ; +// using ostk::physics::unit::Length; +// using ostk::physics::unit::Angle; +// using ostk::physics::unit::Derived; +// using ostk::physics::time::Duration; +// using ostk::physics::coordinate::Position; +// using ostk::physics::coordinate::Velocity; +// using ostk::physics::environment::object::celestial::Earth; -// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE ; +// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE; // { -// FAIL() ; +// FAIL(); // } @@ -393,23 +393,23 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, Compute // TEST (OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, GetMeanMotion) // { -// using ostk::core::type::Real ; +// using ostk::core::type::Real; -// using ostk::mathematics::object::Vector3d ; +// using ostk::mathematics::object::Vector3d; -// using ostk::physics::unit::Length ; -// using ostk::physics::unit::Angle ; -// using ostk::physics::unit::Derived ; -// using ostk::physics::time::Duration ; -// using ostk::physics::coordinate::Position ; -// using ostk::physics::coordinate::Velocity ; -// using ostk::physics::environment::object::celestial::Earth ; +// using ostk::physics::unit::Length; +// using ostk::physics::unit::Angle; +// using ostk::physics::unit::Derived; +// using ostk::physics::time::Duration; +// using ostk::physics::coordinate::Position; +// using ostk::physics::coordinate::Velocity; +// using ostk::physics::environment::object::celestial::Earth; -// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE ; +// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE; // { -// FAIL() ; +// FAIL(); // } @@ -437,23 +437,23 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, GetNoda // TEST (OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, GetOrbitalPeriod) // { -// using ostk::core::type::Real ; +// using ostk::core::type::Real; -// using ostk::mathematics::object::Vector3d ; +// using ostk::mathematics::object::Vector3d; -// using ostk::physics::unit::Length ; -// using ostk::physics::unit::Angle ; -// using ostk::physics::unit::Derived ; -// using ostk::physics::time::Duration ; -// using ostk::physics::coordinate::Position ; -// using ostk::physics::coordinate::Velocity ; -// using ostk::physics::environment::object::celestial::Earth ; +// using ostk::physics::unit::Length; +// using ostk::physics::unit::Angle; +// using ostk::physics::unit::Derived; +// using ostk::physics::time::Duration; +// using ostk::physics::coordinate::Position; +// using ostk::physics::coordinate::Velocity; +// using ostk::physics::environment::object::celestial::Earth; -// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE ; +// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE; // { -// FAIL() ; +// FAIL(); // } @@ -678,23 +678,23 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, FromSIV // TEST (OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, EccentricAnomalyFromTrueAnomaly) // { -// using ostk::core::type::Real ; +// using ostk::core::type::Real; -// using ostk::mathematics::object::Vector3d ; +// using ostk::mathematics::object::Vector3d; -// using ostk::physics::unit::Length ; -// using ostk::physics::unit::Angle ; -// using ostk::physics::unit::Derived ; -// using ostk::physics::time::Duration ; -// using ostk::physics::coordinate::Position ; -// using ostk::physics::coordinate::Velocity ; -// using ostk::physics::environment::object::celestial::Earth ; +// using ostk::physics::unit::Length; +// using ostk::physics::unit::Angle; +// using ostk::physics::unit::Derived; +// using ostk::physics::time::Duration; +// using ostk::physics::coordinate::Position; +// using ostk::physics::coordinate::Velocity; +// using ostk::physics::environment::object::celestial::Earth; -// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE ; +// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE; // { -// FAIL() ; +// FAIL(); // } @@ -703,23 +703,23 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, FromSIV // TEST (OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, TrueAnomalyFromEccentricAnomaly) // { -// using ostk::core::type::Real ; +// using ostk::core::type::Real; -// using ostk::mathematics::object::Vector3d ; +// using ostk::mathematics::object::Vector3d; -// using ostk::physics::unit::Length ; -// using ostk::physics::unit::Angle ; -// using ostk::physics::unit::Derived ; -// using ostk::physics::time::Duration ; -// using ostk::physics::coordinate::Position ; -// using ostk::physics::coordinate::Velocity ; -// using ostk::physics::environment::object::celestial::Earth ; +// using ostk::physics::unit::Length; +// using ostk::physics::unit::Angle; +// using ostk::physics::unit::Derived; +// using ostk::physics::time::Duration; +// using ostk::physics::coordinate::Position; +// using ostk::physics::coordinate::Velocity; +// using ostk::physics::environment::object::celestial::Earth; -// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE ; +// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE; // { -// FAIL() ; +// FAIL(); // } @@ -728,23 +728,23 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, FromSIV // TEST (OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_Kepler_COE, MeanAnomalyFromEccentricAnomaly) // { -// using ostk::core::type::Real ; +// using ostk::core::type::Real; -// using ostk::mathematics::object::Vector3d ; +// using ostk::mathematics::object::Vector3d; -// using ostk::physics::unit::Length ; -// using ostk::physics::unit::Angle ; -// using ostk::physics::unit::Derived ; -// using ostk::physics::time::Duration ; -// using ostk::physics::coordinate::Position ; -// using ostk::physics::coordinate::Velocity ; -// using ostk::physics::environment::object::celestial::Earth ; +// using ostk::physics::unit::Length; +// using ostk::physics::unit::Angle; +// using ostk::physics::unit::Derived; +// using ostk::physics::time::Duration; +// using ostk::physics::coordinate::Position; +// using ostk::physics::coordinate::Velocity; +// using ostk::physics::environment::object::celestial::Earth; -// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE ; +// using ostk::astrodynamics::trajectory::orbit::model::kepler::COE; // { -// FAIL() ; +// FAIL(); // } diff --git a/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4.test.cpp b/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4.test.cpp index 620766666..69c571ba1 100644 --- a/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4.test.cpp +++ b/test/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/SGP4.test.cpp @@ -112,7 +112,7 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_SGP4, Test_1) referenceRow[16].accessReal(), referenceRow[17].accessReal(), referenceRow[18].accessReal() }; - // const Real referenceRevolutionNumber = referenceRow[19].accessReal() ; + // const Real referenceRevolutionNumber = referenceRow[19].accessReal(); const State state_GCRF = orbit.getStateAt(instant); @@ -135,40 +135,40 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_SGP4, Test_1) // STK // const Quaternion ref_q_TEME_GCRF = Quaternion::XYZS(0.000013730697, 0.000889461232, -0.002075913109, - // 0.999997449624).normalize() ; + // 0.999997449624).normalize(); // OUT - // const Quaternion q_TEME_GCRF = Frame::GCRF()->getTransformTo(Frame::TEME(), instant).getOrientation() ; + // const Quaternion q_TEME_GCRF = Frame::GCRF()->getTransformTo(Frame::TEME(), instant).getOrientation(); - // std::cout << "[REF] q_TEME_GCRF = " << ref_q_TEME_GCRF.toString(12) << std::endl ; + // std::cout << "[REF] q_TEME_GCRF = " << ref_q_TEME_GCRF.toString(12) << std::endl; - // std::cout << "[REF] x_GCRF: " << referencePosition_GCRF.toString(12) << std::endl ; - // std::cout << "[REF] x_TEME: " << referencePosition_TEME.toString(12) << std::endl ; + // std::cout << "[REF] x_GCRF: " << referencePosition_GCRF.toString(12) << std::endl; + // std::cout << "[REF] x_TEME: " << referencePosition_TEME.toString(12) << std::endl; - // std::cout << "q_TEME_GCRF = " << q_TEME_GCRF.toString(12) << std::endl ; + // std::cout << "q_TEME_GCRF = " << q_TEME_GCRF.toString(12) << std::endl; - // std::cout << "x_GCRF: " << position_GCRF.accessCoordinates().toString(12) << std::endl ; - // std::cout << "x_TEME: " << position_TEME.accessCoordinates().toString(12) << std::endl ; + // std::cout << "x_GCRF: " << position_GCRF.accessCoordinates().toString(12) << std::endl; + // std::cout << "x_TEME: " << position_TEME.accessCoordinates().toString(12) << std::endl; // std::cout << "dq = " << RotationVector::Quaternion((q_TEME_GCRF / // ref_q_TEME_GCRF).normalize().rectify()).getAngle().inArcseconds().toString(12) << " [asec]" << std::endl - // ; std::cout << "dx_GCRF = " << Real((position_GCRF.accessCoordinates() - - // referencePosition_GCRF).norm()).toString(12) << " [m]" << std::endl ; std::cout << "dx_TEME = " << + //; std::cout << "dx_GCRF = " << Real((position_GCRF.accessCoordinates() - + // referencePosition_GCRF).norm()).toString(12) << " [m]" << std::endl; std::cout << "dx_TEME = " << // Real((position_TEME.accessCoordinates() - referencePosition_TEME).norm()).toString(12) << " [m]" << - // std::endl ; + // std::endl; // std::cout << "x_GCRF A: " << (ref_q_TEME_GCRF.toConjugate() * - // position_TEME.accessCoordinates()).toString(12) << " [m]" << std::endl ; std::cout << "x_GCRF B: " << - // (q_TEME_GCRF.toConjugate() * position_TEME.accessCoordinates()).toString(12) << " [m]" << std::endl ; + // position_TEME.accessCoordinates()).toString(12) << " [m]" << std::endl; std::cout << "x_GCRF B: " << + // (q_TEME_GCRF.toConjugate() * position_TEME.accessCoordinates()).toString(12) << " [m]" << std::endl; - // std::cout << "position_GCRF 1 = " << std::endl << position_GCRF << std::endl ; + // std::cout << "position_GCRF 1 = " << std::endl << position_GCRF << std::endl; // std::cout << "position_GCRF 2 = " << std::endl << - // state_GCRF.inFrame(temeOfEpochFrame).inFrame(Frame::GCRF()).getPosition() << std::endl ; + // state_GCRF.inFrame(temeOfEpochFrame).inFrame(Frame::GCRF()).getPosition() << std::endl; - // std::cout << "position_TEME 1 = " << std::endl << position_TEME << std::endl ; + // std::cout << "position_TEME 1 = " << std::endl << position_TEME << std::endl; // std::cout << "position_TEME 2 = " << std::endl << - // state_TEME.inFrame(Frame::GCRF()).inFrame(temeOfEpochFrame).getPosition() << std::endl ; + // state_TEME.inFrame(Frame::GCRF()).inFrame(temeOfEpochFrame).getPosition() << std::endl; EXPECT_EQ(*Frame::TEMEOfEpoch(tle.getEpoch()), *position_TEME.accessFrame()); EXPECT_EQ(*Frame::TEMEOfEpoch(tle.getEpoch()), *velocity_TEME.accessFrame()); @@ -189,26 +189,26 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_SGP4, Test_1) EXPECT_GT(10.0, (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm()); EXPECT_GT(1e-2, (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm()); - // EXPECT_EQ(referenceRevolutionNumber.floor(), orbit.getRevolutionNumberAt(instant)) ; + // EXPECT_EQ(referenceRevolutionNumber.floor(), orbit.getRevolutionNumberAt(instant)); // std::cout << "x @ GCRF = " << referencePosition_GCRF.toString(10) << " / " << - // position_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "x @ ITRF = " << + // position_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "x @ ITRF = " << // referencePosition_ITRF.toString(10) << " / " << position_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() - // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dx = " << (position_GCRF.accessCoordinates() - referencePosition_GCRF).norm() + // << " - " << (position_ITRF.accessCoordinates() - referencePosition_ITRF).norm() << std::endl; // std::cout << "v @ GCRF = " << referenceVelocity_GCRF.toString(10) << " / " << - // velocity_GCRF.accessCoordinates().toString(10) << std::endl ; std::cout << "v @ ITRF = " << + // velocity_GCRF.accessCoordinates().toString(10) << std::endl; std::cout << "v @ ITRF = " << // referenceVelocity_ITRF.toString(10) << " / " << velocity_ITRF.accessCoordinates().toString(10) << - // std::endl ; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() - // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl ; + // std::endl; std::cout << "dv = " << (velocity_GCRF.accessCoordinates() - referenceVelocity_GCRF).norm() + // << " - " << (velocity_ITRF.accessCoordinates() - referenceVelocity_ITRF).norm() << std::endl; // std::cout << "dx = " << Real((position_TEME.accessCoordinates() - // referencePosition_TEME).norm()).toString(12) << " - " << Real((position_GCRF.accessCoordinates() - // referencePosition_GCRF).norm()).toString(12) // << " | " << "dv = " << Real((velocity_TEME.accessCoordinates() - // referenceVelocity_TEME).norm()).toString(12) << " - " << Real((velocity_GCRF.accessCoordinates() - - // referenceVelocity_GCRF).norm()).toString(12) << std::endl ; + // referenceVelocity_GCRF).norm()).toString(12) << std::endl; // std::cout << "dx = " << Real((position_TEME.accessCoordinates() - // referencePosition_TEME).norm()).toString(12) << " - " << Real((position_GCRF.accessCoordinates() - @@ -217,9 +217,9 @@ TEST(OpenSpaceToolkit_Astrodynamics_Trajectory_Orbit_Model_SGP4, Test_1) // << " | " << "dv = " << Real((velocity_TEME.accessCoordinates() - // referenceVelocity_TEME).norm()).toString(12) << " - " << Real((velocity_GCRF.accessCoordinates() - // referenceVelocity_GCRF).norm()).toString(12) << " - " << Real((velocity_ITRF.accessCoordinates() - - // referenceVelocity_ITRF).norm()).toString(12) << std::endl ; + // referenceVelocity_ITRF).norm()).toString(12) << std::endl; - // FAIL() ; + // FAIL(); } } }