diff --git a/src/dynamics/dynamics.cpp b/src/dynamics/dynamics.cpp index 49f226dde..1a9da635e 100644 --- a/src/dynamics/dynamics.cpp +++ b/src/dynamics/dynamics.cpp @@ -5,8 +5,6 @@ #include "dynamics.hpp" -#include "../simulation/multiple_spacecraft/relative_information.hpp" - namespace s2e::dynamics { Dynamics(const simulation::SimulationConfiguration* simulation_configuration, const environment::SimulationTime* simulation_time, diff --git a/src/dynamics/dynamics.hpp b/src/dynamics/dynamics.hpp index 5267f7a64..be8534181 100644 --- a/src/dynamics/dynamics.hpp +++ b/src/dynamics/dynamics.hpp @@ -10,6 +10,7 @@ #include "../environment/global/simulation_time.hpp" #include "../environment/local/local_environment.hpp" #include "../math_physics/math/vector.hpp" +#include "../simulation/multiple_spacecraft/relative_information.hpp" #include "../simulation/simulation_configuration.hpp" #include "../simulation/spacecraft/structure/structure.hpp" #include "dynamics/attitude/initialize_attitude.hpp" @@ -17,8 +18,12 @@ #include "dynamics/thermal/node.hpp" #include "dynamics/thermal/temperature.hpp" -class s2e::simulation::RelativeInformation; -class s2e::environment::LocalEnvironment; +namespace s2e::simulation { +class RelativeInformation; +} +namespace s2e::environment { +class LocalEnvironment; +} namespace s2e::dynamics { @@ -53,7 +58,7 @@ class Dynamics { * @param [in] simulation_time: Simulation time * @param [in] local_celestial_information: Local celestial information */ - void Update(const simulation::SimulationTime* simulation_time, const environment::LocalCelestialInformation* local_celestial_information); + void Update(const environment::SimulationTime* simulation_time, const environment::LocalCelestialInformation* local_celestial_information); /** * @fn LogSetup diff --git a/src/dynamics/orbit/orbit.hpp b/src/dynamics/orbit/orbit.hpp index 9bdfc4851..c51f0dc61 100644 --- a/src/dynamics/orbit/orbit.hpp +++ b/src/dynamics/orbit/orbit.hpp @@ -27,7 +27,7 @@ enum class OrbitPropagateMode { kSgp4, //!< SGP4 propagation using TLE without thruster maneuver kRelativeOrbit, //!< Relative dynamics (for formation flying simulation) kKepler, //!< Kepler orbit propagation without disturbances and thruster maneuver - kEncke, //!< Encke orbit propagation with disturbances and thruster maneuver + kEncke, //!< Encke orbit propagation with disturbances and thruster maneuver kTimeSeriesFile //!< Orbit propagation using time series file }; diff --git a/src/dynamics/orbit/time_series_file_orbit_propagation.cpp b/src/dynamics/orbit/time_series_file_orbit_propagation.cpp index 709b23335..8fe9893a0 100644 --- a/src/dynamics/orbit/time_series_file_orbit_propagation.cpp +++ b/src/dynamics/orbit/time_series_file_orbit_propagation.cpp @@ -152,4 +152,3 @@ bool TimeSeriesFileOrbitPropagation::UpdateInterpolationInformation() { return true; } - diff --git a/src/dynamics/orbit/time_series_file_orbit_propagation.hpp b/src/dynamics/orbit/time_series_file_orbit_propagation.hpp index 0db88a7de..0de5a7278 100644 --- a/src/dynamics/orbit/time_series_file_orbit_propagation.hpp +++ b/src/dynamics/orbit/time_series_file_orbit_propagation.hpp @@ -85,4 +85,3 @@ class TimeSeriesFileOrbitPropagation : public Orbit { }; #endif // S2E_DYNAMICS_ORBIT_TIME_SERIES_FILE_ORBIT_PROPAGATION_HPP_ - diff --git a/src/environment/local/local_environment.hpp b/src/environment/local/local_environment.hpp index ef671a499..b486d4226 100644 --- a/src/environment/local/local_environment.hpp +++ b/src/environment/local/local_environment.hpp @@ -15,6 +15,10 @@ #include "simulation/simulation_configuration.hpp" #include "solar_radiation_pressure_environment.hpp" +namespace s2e::math { +class Dynamics; +} + namespace s2e::environment { /** diff --git a/src/setting_file_reader/wings_operation_file.hpp b/src/setting_file_reader/wings_operation_file.hpp index 848010aac..51ed0d1d5 100644 --- a/src/setting_file_reader/wings_operation_file.hpp +++ b/src/setting_file_reader/wings_operation_file.hpp @@ -37,6 +37,6 @@ class WingsOperationFile { size_t line_pointer_ = 0; //!< Line pointer }; -} // namespace s2e::setting_file_reader +} // namespace s2e::setting_file_reader #endif // S2E_LIBRARY_INITIALIZE_WINGS_OPERATION_FILE_HPP_ diff --git a/src/simulation/multiple_spacecraft/relative_information.hpp b/src/simulation/multiple_spacecraft/relative_information.hpp index 9e77403d0..d49f4c74a 100644 --- a/src/simulation/multiple_spacecraft/relative_information.hpp +++ b/src/simulation/multiple_spacecraft/relative_information.hpp @@ -6,12 +6,17 @@ #ifndef S2E_MULTIPLE_SPACECRAFT_RELATIVE_INFORMATION_HPP_ #define S2E_MULTIPLE_SPACECRAFT_RELATIVE_INFORMATION_HPP_ +#include #include #include "../../dynamics/dynamics.hpp" #include "../../logger/loggable.hpp" #include "../../logger/logger.hpp" +namespace s2e::dynamics { +class Dynamics; +} + namespace s2e::simulation { /** @@ -42,7 +47,7 @@ class RelativeInformation : public logger::ILoggable { * @param [in] spacecraft_id: ID of target spacecraft * @param [in] dynamics: Dynamics information of the target spacecraft */ - void RegisterDynamicsInfo(const size_t spacecraft_id, const dynamics::dynamics::Dynamics* dynamics); + void RegisterDynamicsInfo(const size_t spacecraft_id, const dynamics::Dynamics* dynamics); /** * @fn RegisterDynamicsInfo * @brief Remove dynamics information of target spacecraft @@ -129,12 +134,12 @@ class RelativeInformation : public logger::ILoggable { * @brief Return the dynamics information of a spacecraft * @param [in] target_spacecraft_id: ID of the spacecraft */ - inline const dynamics::dynamics::Dynamics* GetReferenceSatDynamics(const size_t reference_spacecraft_id) const { + inline const dynamics::Dynamics* GetReferenceSatDynamics(const size_t reference_spacecraft_id) const { return dynamics_database_.at(reference_spacecraft_id); }; private: - std::map dynamics_database_; //!< Dynamics database of all spacecraft + std::map dynamics_database_; //!< Dynamics database of all spacecraft std::vector>> relative_position_list_i_m_; //!< Relative position list in the inertial frame in unit [m] std::vector>> relative_velocity_list_i_m_s_; //!< Relative velocity list in the inertial frame in unit [m/s] diff --git a/src/utilities/com_port_interface.cpp b/src/utilities/com_port_interface.cpp index 70209cde8..4644fa5c9 100644 --- a/src/utilities/com_port_interface.cpp +++ b/src/utilities/com_port_interface.cpp @@ -117,4 +117,4 @@ int ComPortInterface::DiscardInBuffer() { return 0; } -} // namespace s2e::utilities +} // namespace s2e::utilities diff --git a/src/utilities/quantization.cpp b/src/utilities/quantization.cpp index 9b8aa00d5..1cfd3268e 100644 --- a/src/utilities/quantization.cpp +++ b/src/utilities/quantization.cpp @@ -14,4 +14,4 @@ double quantization(const double continuous_number, const double resolution) { float quantization_float(const double continuous_number, const double resolution) { return (float)quantization(continuous_number, resolution); } -} // namespace s2e::utilities +} // namespace s2e::utilities