diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e55a03b2..808a79008 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,11 @@ add_subdirectory(src/environment/local) add_subdirectory(src/dynamics) add_subdirectory(src/disturbances) add_subdirectory(src/components) -add_subdirectory(src/library) +add_subdirectory(src/math_physics) +add_subdirectory(src/setting_file_reader) +add_subdirectory(src/logger) +add_subdirectory(src/utilities) +add_subdirectory(ExtLibraries/inih) set(SOURCE_FILES src/s2e.cpp @@ -178,13 +182,14 @@ endif() #target_link_libraries(${PROJECT_NAME} ${NRLMSISE00_LIB}) # Initialize link -target_link_libraries(COMPONENT DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT LIBRARY) -target_link_libraries(DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT SIMULATION LIBRARY) -target_link_libraries(DISTURBANCE DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT LIBRARY) -target_link_libraries(SIMULATION DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT DISTURBANCE LIBRARY) -target_link_libraries(GLOBAL_ENVIRONMENT ${CSPICE_LIB} LIBRARY) -target_link_libraries(LOCAL_ENVIRONMENT GLOBAL_ENVIRONMENT ${CSPICE_LIB} LIBRARY) -target_link_libraries(LIBRARY ${NRLMSISE00_LIB}) +target_link_libraries(COMPONENT DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT MATH_PHYSICS SETTING_FILE_READER LOGGER UTILITIES) +target_link_libraries(DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT SIMULATION MATH_PHYSICS) +target_link_libraries(DISTURBANCE DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT MATH_PHYSICS) +target_link_libraries(SIMULATION DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT DISTURBANCE MATH_PHYSICS) +target_link_libraries(GLOBAL_ENVIRONMENT ${CSPICE_LIB} MATH_PHYSICS) +target_link_libraries(LOCAL_ENVIRONMENT GLOBAL_ENVIRONMENT ${CSPICE_LIB} MATH_PHYSICS) +target_link_libraries(MATH_PHYSICS ${NRLMSISE00_LIB}) +target_link_libraries(SETTING_FILE_READER INIH) target_link_libraries(${PROJECT_NAME} DYNAMICS) target_link_libraries(${PROJECT_NAME} DISTURBANCE) @@ -235,7 +240,7 @@ if(GOOGLE_TEST) add_executable(${TEST_PROJECT_NAME} ${TEST_FILES}) target_link_libraries(${TEST_PROJECT_NAME} gtest gtest_main gmock) - target_link_libraries(${TEST_PROJECT_NAME} LIBRARY) + target_link_libraries(${TEST_PROJECT_NAME} MATH_PHYSICS) include_directories(${TEST_PROJECT_NAME}) add_test(NAME s2e-test COMMAND ${TEST_PROJECT_NAME}) enable_testing() diff --git a/ExtLibraries/inih/CMakeLists.txt b/ExtLibraries/inih/CMakeLists.txt new file mode 100644 index 000000000..4b18a7051 --- /dev/null +++ b/ExtLibraries/inih/CMakeLists.txt @@ -0,0 +1,9 @@ +project(INIH) +cmake_minimum_required(VERSION 3.13) + +add_library(${PROJECT_NAME} STATIC + ini.c + cpp/INIReader.cpp +) + +include(../../common.cmake) diff --git a/src/library/external/inih/LICENSE.txt b/ExtLibraries/inih/LICENSE.txt similarity index 100% rename from src/library/external/inih/LICENSE.txt rename to ExtLibraries/inih/LICENSE.txt diff --git a/src/library/external/inih/README.md b/ExtLibraries/inih/README.md similarity index 100% rename from src/library/external/inih/README.md rename to ExtLibraries/inih/README.md diff --git a/src/library/external/inih/cpp/INIReader.cpp b/ExtLibraries/inih/cpp/INIReader.cpp similarity index 100% rename from src/library/external/inih/cpp/INIReader.cpp rename to ExtLibraries/inih/cpp/INIReader.cpp diff --git a/src/library/external/inih/cpp/INIReader.h b/ExtLibraries/inih/cpp/INIReader.h similarity index 100% rename from src/library/external/inih/cpp/INIReader.h rename to ExtLibraries/inih/cpp/INIReader.h diff --git a/src/library/external/inih/ini.c b/ExtLibraries/inih/ini.c similarity index 100% rename from src/library/external/inih/ini.c rename to ExtLibraries/inih/ini.c diff --git a/src/library/external/inih/ini.h b/ExtLibraries/inih/ini.h similarity index 100% rename from src/library/external/inih/ini.h rename to ExtLibraries/inih/ini.h diff --git a/data/sample/initialize_files/sample_local_environment.ini b/data/sample/initialize_files/sample_local_environment.ini index fce7453c5..bcd67e73c 100644 --- a/data/sample/initialize_files/sample_local_environment.ini +++ b/data/sample/initialize_files/sample_local_environment.ini @@ -1,7 +1,7 @@ [MAGNETIC_FIELD_ENVIRONMENT] calculation = ENABLE logging = ENABLE -coefficient_file = CORE_DIR_FROM_EXE/src/library/external/igrf/igrf13.coef +coefficient_file = CORE_DIR_FROM_EXE/src/math_physics/geomagnetic/igrf13.coef magnetic_field_random_walk_standard_deviation_nT = 10.0 magnetic_field_random_walk_limit_nT = 400.0 magnetic_field_white_noise_standard_deviation_nT = 50.0 diff --git a/src/components/base/component.hpp b/src/components/base/component.hpp index cb4049985..91432e1f3 100644 --- a/src/components/base/component.hpp +++ b/src/components/base/component.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include "interface_tickable.hpp" diff --git a/src/components/base/i2c_controller.cpp b/src/components/base/i2c_controller.cpp index 2d6e0970d..64e1429ba 100644 --- a/src/components/base/i2c_controller.cpp +++ b/src/components/base/i2c_controller.cpp @@ -5,7 +5,7 @@ #include "i2c_controller.hpp" #include -#include +#include I2cController::I2cController(const unsigned int hils_port_id, const unsigned int baud_rate, const unsigned int tx_buffer_size, const unsigned int rx_buffer_size, HilsPortManager* hils_port_manager) diff --git a/src/components/base/sensor.hpp b/src/components/base/sensor.hpp index 111e71226..66b1bb1ce 100644 --- a/src/components/base/sensor.hpp +++ b/src/components/base/sensor.hpp @@ -6,10 +6,10 @@ #ifndef S2E_COMPONENTS_BASE_SENSOR_HPP_ #define S2E_COMPONENTS_BASE_SENSOR_HPP_ -#include -#include -#include -#include +#include +#include +#include +#include /** * @class Sensor diff --git a/src/components/base/sensor_template_functions.hpp b/src/components/base/sensor_template_functions.hpp index 3c3f46cd5..e7c66b7d7 100644 --- a/src/components/base/sensor_template_functions.hpp +++ b/src/components/base/sensor_template_functions.hpp @@ -6,8 +6,8 @@ #ifndef S2E_COMPONENTS_BASE_SENSOR_TEMPLATE_FUNCTIONS_HPP_ #define S2E_COMPONENTS_BASE_SENSOR_TEMPLATE_FUNCTIONS_HPP_ -#include -#include +#include +#include template Sensor::Sensor(const libra::Matrix& scale_factor, const libra::Vector& range_to_const_c, const libra::Vector& range_to_zero_c, diff --git a/src/components/examples/example_change_structure.cpp b/src/components/examples/example_change_structure.cpp index 1dcd29b04..21bc129d0 100644 --- a/src/components/examples/example_change_structure.cpp +++ b/src/components/examples/example_change_structure.cpp @@ -5,7 +5,7 @@ #include "example_change_structure.hpp" -#include +#include ExampleChangeStructure::ExampleChangeStructure(ClockGenerator* clock_generator, Structure* structure) : Component(1, clock_generator), structure_(structure) {} diff --git a/src/components/examples/example_change_structure.hpp b/src/components/examples/example_change_structure.hpp index 4aa28713f..31d656c92 100644 --- a/src/components/examples/example_change_structure.hpp +++ b/src/components/examples/example_change_structure.hpp @@ -6,7 +6,7 @@ #ifndef S2E_COMPONENTS_EXAMPLES_EXAMPLE_CHANGE_STRUCTURE_HPP_ #define S2E_COMPONENTS_EXAMPLES_EXAMPLE_CHANGE_STRUCTURE_HPP_ -#include +#include #include #include "../base/component.hpp" diff --git a/src/components/examples/example_serial_communication_for_hils.cpp b/src/components/examples/example_serial_communication_for_hils.cpp index 8986e85db..fe0b9b3d8 100644 --- a/src/components/examples/example_serial_communication_for_hils.cpp +++ b/src/components/examples/example_serial_communication_for_hils.cpp @@ -4,7 +4,7 @@ */ #include "example_serial_communication_for_hils.hpp" -#include +#include ExampleSerialCommunicationForHils::ExampleSerialCommunicationForHils(ClockGenerator* clock_generator, const int sils_port_id, OnBoardComputer* obc, const unsigned int hils_port_id, const unsigned int baud_rate, diff --git a/src/components/ideal/angular_velocity_observer.cpp b/src/components/ideal/angular_velocity_observer.cpp index 48b076140..6ff33272f 100644 --- a/src/components/ideal/angular_velocity_observer.cpp +++ b/src/components/ideal/angular_velocity_observer.cpp @@ -5,7 +5,7 @@ #include "angular_velocity_observer.hpp" -#include +#include AngularVelocityObserver::AngularVelocityObserver(const int prescaler, ClockGenerator* clock_generator, Sensor& sensor_base, const Attitude& attitude) : Component(prescaler, clock_generator), Sensor(sensor_base), attitude_(attitude) {} diff --git a/src/components/ideal/angular_velocity_observer.hpp b/src/components/ideal/angular_velocity_observer.hpp index 9b3fbe006..5ec2e69c4 100644 --- a/src/components/ideal/angular_velocity_observer.hpp +++ b/src/components/ideal/angular_velocity_observer.hpp @@ -7,7 +7,7 @@ #define S2E_COMPONENTS_IDEAL_ANGULAR_VELOCITY_OBSERVER_HPP_ #include -#include +#include #include "../base/component.hpp" #include "../base/sensor.hpp" diff --git a/src/components/ideal/attitude_observer.cpp b/src/components/ideal/attitude_observer.cpp index 7ddaa1a0c..b098c0b22 100644 --- a/src/components/ideal/attitude_observer.cpp +++ b/src/components/ideal/attitude_observer.cpp @@ -5,8 +5,8 @@ #include "attitude_observer.hpp" -#include -#include +#include +#include AttitudeObserver::AttitudeObserver(const int prescaler, ClockGenerator* clock_generator, const double standard_deviation_rad, const Attitude& attitude) diff --git a/src/components/ideal/attitude_observer.hpp b/src/components/ideal/attitude_observer.hpp index 1fafb63a0..c00cebd13 100644 --- a/src/components/ideal/attitude_observer.hpp +++ b/src/components/ideal/attitude_observer.hpp @@ -7,9 +7,9 @@ #define S2E_COMPONENTS_IDEAL_ATTITUDE_OBSERVER_HPP_ #include -#include -#include -#include +#include +#include +#include #include "../base/component.hpp" diff --git a/src/components/ideal/force_generator.cpp b/src/components/ideal/force_generator.cpp index 8e7a610b9..13efaa32b 100644 --- a/src/components/ideal/force_generator.cpp +++ b/src/components/ideal/force_generator.cpp @@ -6,7 +6,7 @@ #include "force_generator.hpp" #include -#include +#include // Constructor ForceGenerator::ForceGenerator(const int prescaler, ClockGenerator* clock_generator, const double magnitude_error_standard_deviation_N, diff --git a/src/components/ideal/force_generator.hpp b/src/components/ideal/force_generator.hpp index 8e1a7d1e6..53adf392c 100644 --- a/src/components/ideal/force_generator.hpp +++ b/src/components/ideal/force_generator.hpp @@ -8,9 +8,9 @@ #include #include -#include -#include -#include +#include +#include +#include /* * @class ForceGenerator diff --git a/src/components/ideal/orbit_observer.cpp b/src/components/ideal/orbit_observer.cpp index 61fe2b002..19d26c8b9 100644 --- a/src/components/ideal/orbit_observer.cpp +++ b/src/components/ideal/orbit_observer.cpp @@ -5,8 +5,8 @@ #include "orbit_observer.hpp" -#include -#include +#include +#include OrbitObserver::OrbitObserver(const int prescaler, ClockGenerator* clock_generator, const NoiseFrame noise_frame, const libra::Vector<6> error_standard_deviation, const Orbit& orbit) diff --git a/src/components/ideal/orbit_observer.hpp b/src/components/ideal/orbit_observer.hpp index 490489957..976a8d236 100644 --- a/src/components/ideal/orbit_observer.hpp +++ b/src/components/ideal/orbit_observer.hpp @@ -7,9 +7,9 @@ #define S2E_COMPONENTS_IDEAL_ORBIT_OBSERVER_HPP_ #include -#include -#include -#include +#include +#include +#include #include "../base/component.hpp" diff --git a/src/components/ideal/torque_generator.cpp b/src/components/ideal/torque_generator.cpp index 5965fdc4e..a2adb097c 100644 --- a/src/components/ideal/torque_generator.cpp +++ b/src/components/ideal/torque_generator.cpp @@ -6,7 +6,7 @@ #include "torque_generator.hpp" #include -#include +#include // Constructor TorqueGenerator::TorqueGenerator(const int prescaler, ClockGenerator* clock_generator, const double magnitude_error_standard_deviation_Nm, diff --git a/src/components/ideal/torque_generator.hpp b/src/components/ideal/torque_generator.hpp index 78474917b..10aacf19d 100644 --- a/src/components/ideal/torque_generator.hpp +++ b/src/components/ideal/torque_generator.hpp @@ -8,9 +8,9 @@ #include #include -#include -#include -#include +#include +#include +#include /* * @class TorqueGenerator diff --git a/src/components/ports/i2c_port.cpp b/src/components/ports/i2c_port.cpp index d01b5b21d..715fd9538 100644 --- a/src/components/ports/i2c_port.cpp +++ b/src/components/ports/i2c_port.cpp @@ -5,7 +5,7 @@ #include "i2c_port.hpp" -#include +#include I2cPort::I2cPort(void) {} diff --git a/src/components/ports/power_port.cpp b/src/components/ports/power_port.cpp index d1456c10f..1a3393ec3 100644 --- a/src/components/ports/power_port.cpp +++ b/src/components/ports/power_port.cpp @@ -6,8 +6,8 @@ #include "power_port.hpp" #include -#include -#include +#include +#include PowerPort::PowerPort() : kPortId(-1), current_limit_A_(10.0), minimum_voltage_V_(3.3), assumed_power_consumption_W_(0.0) { is_on_ = true; // power on to work the component diff --git a/src/components/ports/uart_port.hpp b/src/components/ports/uart_port.hpp index 21849aff0..b50f90c28 100644 --- a/src/components/ports/uart_port.hpp +++ b/src/components/ports/uart_port.hpp @@ -6,7 +6,7 @@ #ifndef S2E_COMPONENTS_PORTS_UART_PORT_HPP_ #define S2E_COMPONENTS_PORTS_UART_PORT_HPP_ -#include +#include /** * @class UartPort diff --git a/src/components/real/aocs/gnss_receiver.cpp b/src/components/real/aocs/gnss_receiver.cpp index f182764f4..a1f11880b 100644 --- a/src/components/real/aocs/gnss_receiver.cpp +++ b/src/components/real/aocs/gnss_receiver.cpp @@ -6,9 +6,9 @@ #include "gnss_receiver.hpp" #include -#include -#include -#include +#include +#include +#include #include GnssReceiver::GnssReceiver(const int prescaler, ClockGenerator* clock_generator, const size_t component_id, const AntennaModel antenna_model, diff --git a/src/components/real/aocs/gnss_receiver.hpp b/src/components/real/aocs/gnss_receiver.hpp index 04026e89f..1345217b5 100644 --- a/src/components/real/aocs/gnss_receiver.hpp +++ b/src/components/real/aocs/gnss_receiver.hpp @@ -9,10 +9,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "../../base/component.hpp" diff --git a/src/components/real/aocs/gyro_sensor.cpp b/src/components/real/aocs/gyro_sensor.cpp index b22f99e1f..5df3751f3 100644 --- a/src/components/real/aocs/gyro_sensor.cpp +++ b/src/components/real/aocs/gyro_sensor.cpp @@ -5,7 +5,7 @@ #include "gyro_sensor.hpp" -#include +#include GyroSensor::GyroSensor(const int prescaler, ClockGenerator* clock_generator, Sensor& sensor_base, const unsigned int sensor_id, const libra::Quaternion& quaternion_b2c, const Dynamics* dynamics) diff --git a/src/components/real/aocs/gyro_sensor.hpp b/src/components/real/aocs/gyro_sensor.hpp index f391b2d6e..239bb29df 100644 --- a/src/components/real/aocs/gyro_sensor.hpp +++ b/src/components/real/aocs/gyro_sensor.hpp @@ -7,8 +7,8 @@ #define S2E_COMPONENTS_REAL_AOCS_GYRO_SENSOR_HPP_ #include -#include -#include +#include +#include #include "../../base/component.hpp" #include "../../base/sensor.hpp" diff --git a/src/components/real/aocs/magnetometer.cpp b/src/components/real/aocs/magnetometer.cpp index d6e44b9d1..b2cbc730c 100644 --- a/src/components/real/aocs/magnetometer.cpp +++ b/src/components/real/aocs/magnetometer.cpp @@ -4,8 +4,8 @@ */ #include "magnetometer.hpp" -#include -#include +#include +#include Magnetometer::Magnetometer(int prescaler, ClockGenerator* clock_generator, Sensor& sensor_base, const unsigned int sensor_id, const libra::Quaternion& quaternion_b2c, const GeomagneticField* geomagnetic_field) diff --git a/src/components/real/aocs/magnetometer.hpp b/src/components/real/aocs/magnetometer.hpp index c352b0553..5140eb7ef 100644 --- a/src/components/real/aocs/magnetometer.hpp +++ b/src/components/real/aocs/magnetometer.hpp @@ -7,8 +7,8 @@ #define S2E_COMPONENTS_REAL_AOCS_MAGNETOMETER_HPP_ #include -#include -#include +#include +#include #include "../../base/component.hpp" #include "../../base/sensor.hpp" diff --git a/src/components/real/aocs/magnetorquer.cpp b/src/components/real/aocs/magnetorquer.cpp index ab47dc6d1..135a3782f 100644 --- a/src/components/real/aocs/magnetorquer.cpp +++ b/src/components/real/aocs/magnetorquer.cpp @@ -5,11 +5,11 @@ #include "magnetorquer.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include Magnetorquer::Magnetorquer(const int prescaler, ClockGenerator* clock_generator, const int component_id, const libra::Quaternion& quaternion_b2c, const libra::Matrix& scale_factor, diff --git a/src/components/real/aocs/magnetorquer.hpp b/src/components/real/aocs/magnetorquer.hpp index e4be7361f..8a8bbc1a7 100644 --- a/src/components/real/aocs/magnetorquer.hpp +++ b/src/components/real/aocs/magnetorquer.hpp @@ -7,12 +7,12 @@ #define S2E_COMPONENTS_REAL_AOCS_MAGNETORQUER_HPP_ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "../../base/component.hpp" diff --git a/src/components/real/aocs/mtq_magnetometer_interference.cpp b/src/components/real/aocs/mtq_magnetometer_interference.cpp index c854453bd..617cec6d3 100644 --- a/src/components/real/aocs/mtq_magnetometer_interference.cpp +++ b/src/components/real/aocs/mtq_magnetometer_interference.cpp @@ -5,7 +5,7 @@ #include "mtq_magnetometer_interference.hpp" -#include "library/initialize/initialize_file_access.hpp" +#include "setting_file_reader/initialize_file_access.hpp" MtqMagnetometerInterference::MtqMagnetometerInterference(const std::string file_name, Magnetometer& magnetometer, const Magnetorquer& magnetorquer, const size_t initialize_id) diff --git a/src/components/real/aocs/reaction_wheel.cpp b/src/components/real/aocs/reaction_wheel.cpp index 47dfe3bc6..cd275985c 100644 --- a/src/components/real/aocs/reaction_wheel.cpp +++ b/src/components/real/aocs/reaction_wheel.cpp @@ -6,10 +6,10 @@ #include #include -#include -#include -#include +#include +#include #include +#include ReactionWheel::ReactionWheel(const int prescaler, ClockGenerator* clock_generator, const int component_id, const double step_width_s, const double rotor_inertia_kgm2, const double max_torque_Nm, const double max_velocity_rpm, diff --git a/src/components/real/aocs/reaction_wheel.hpp b/src/components/real/aocs/reaction_wheel.hpp index d78e3d39b..6e684db1f 100644 --- a/src/components/real/aocs/reaction_wheel.hpp +++ b/src/components/real/aocs/reaction_wheel.hpp @@ -6,10 +6,10 @@ #ifndef S2E_COMPONENTS_REAL_AOCS_REACTION_WHEEL_HPP_ #define S2E_COMPONENTS_REAL_AOCS_REACTION_WHEEL_HPP_ -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/src/components/real/aocs/reaction_wheel_jitter.cpp b/src/components/real/aocs/reaction_wheel_jitter.cpp index 1d7be9838..cf99ad2ea 100644 --- a/src/components/real/aocs/reaction_wheel_jitter.cpp +++ b/src/components/real/aocs/reaction_wheel_jitter.cpp @@ -5,9 +5,9 @@ #include "reaction_wheel_jitter.hpp" -#include -#include +#include #include +#include ReactionWheelJitter::ReactionWheelJitter(std::vector> radial_force_harmonics_coefficients, std::vector> radial_torque_harmonics_coefficients, const double update_interval_s, diff --git a/src/components/real/aocs/reaction_wheel_jitter.hpp b/src/components/real/aocs/reaction_wheel_jitter.hpp index 77c8bfc04..9eb241525 100644 --- a/src/components/real/aocs/reaction_wheel_jitter.hpp +++ b/src/components/real/aocs/reaction_wheel_jitter.hpp @@ -7,8 +7,8 @@ #define S2E_COMPONENTS_REAL_AOCS_REACTION_WHEEL_JITTER_HPP_ #pragma once -#include -#include +#include +#include #include /* diff --git a/src/components/real/aocs/reaction_wheel_ode.cpp b/src/components/real/aocs/reaction_wheel_ode.cpp index f90162d53..2ef53768e 100644 --- a/src/components/real/aocs/reaction_wheel_ode.cpp +++ b/src/components/real/aocs/reaction_wheel_ode.cpp @@ -4,7 +4,7 @@ */ #include "reaction_wheel_ode.hpp" -#include +#include ReactionWheelOde::ReactionWheelOde(const double step_width_s, const double velocity_limit_rad_s, const double initial_angular_velocity_rad_s) : OrdinaryDifferentialEquation<1>(step_width_s), velocity_limit_rad_s_(velocity_limit_rad_s) { diff --git a/src/components/real/aocs/reaction_wheel_ode.hpp b/src/components/real/aocs/reaction_wheel_ode.hpp index bbedfe60d..6a4b333ae 100644 --- a/src/components/real/aocs/reaction_wheel_ode.hpp +++ b/src/components/real/aocs/reaction_wheel_ode.hpp @@ -6,7 +6,7 @@ #ifndef S2E_COMPONENTS_REAL_AOCS_REACTION_WHEEL_ODE_HPP_ #define S2E_COMPONENTS_REAL_AOCS_REACTION_WHEEL_ODE_HPP_ -#include +#include /* * @file ReactionWheelOde diff --git a/src/components/real/aocs/star_sensor.cpp b/src/components/real/aocs/star_sensor.cpp index 15c4033f6..86826b98c 100644 --- a/src/components/real/aocs/star_sensor.cpp +++ b/src/components/real/aocs/star_sensor.cpp @@ -6,11 +6,11 @@ #include "star_sensor.hpp" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include using namespace std; diff --git a/src/components/real/aocs/star_sensor.hpp b/src/components/real/aocs/star_sensor.hpp index b2f4daef9..67ba9c3c9 100644 --- a/src/components/real/aocs/star_sensor.hpp +++ b/src/components/real/aocs/star_sensor.hpp @@ -8,11 +8,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "../../base/component.hpp" diff --git a/src/components/real/aocs/sun_sensor.cpp b/src/components/real/aocs/sun_sensor.cpp index c10959a9e..d0d9b599f 100644 --- a/src/components/real/aocs/sun_sensor.cpp +++ b/src/components/real/aocs/sun_sensor.cpp @@ -5,12 +5,12 @@ #include "sun_sensor.hpp" -#include -#include +#include +#include using libra::NormalRand; -#include -#include -#include +#include +#include +#include using namespace std; diff --git a/src/components/real/aocs/sun_sensor.hpp b/src/components/real/aocs/sun_sensor.hpp index f1c59a670..255c834a7 100644 --- a/src/components/real/aocs/sun_sensor.hpp +++ b/src/components/real/aocs/sun_sensor.hpp @@ -8,10 +8,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "../../base/component.hpp" diff --git a/src/components/real/communication/antenna.cpp b/src/components/real/communication/antenna.cpp index 3941e1690..926cfe0b7 100644 --- a/src/components/real/communication/antenna.cpp +++ b/src/components/real/communication/antenna.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include Antenna::Antenna(const int component_id, const libra::Quaternion& quaternion_b2c, const bool is_transmitter, const bool is_receiver, const double frequency_MHz, const Vector<5> tx_parameters, const Vector<4> rx_parameters) diff --git a/src/components/real/communication/antenna.hpp b/src/components/real/communication/antenna.hpp index 1d487493a..acee9935f 100644 --- a/src/components/real/communication/antenna.hpp +++ b/src/components/real/communication/antenna.hpp @@ -6,8 +6,8 @@ #ifndef S2E_COMPONENTS_REAL_COMMUNICATION_ANTENNA_HPP_ #define S2E_COMPONENTS_REAL_COMMUNICATION_ANTENNA_HPP_ -#include -#include +#include +#include using libra::Quaternion; using libra::Vector; #include diff --git a/src/components/real/communication/antenna_radiation_pattern.cpp b/src/components/real/communication/antenna_radiation_pattern.cpp index e1812fe0f..a82929c11 100644 --- a/src/components/real/communication/antenna_radiation_pattern.cpp +++ b/src/components/real/communication/antenna_radiation_pattern.cpp @@ -6,8 +6,8 @@ #include "antenna_radiation_pattern.hpp" #include -#include -#include +#include +#include AntennaRadiationPattern::AntennaRadiationPattern() { gain_dBi_.assign(length_theta_, std::vector(length_phi_, 0.0)); } diff --git a/src/components/real/communication/antenna_radiation_pattern.hpp b/src/components/real/communication/antenna_radiation_pattern.hpp index 35490c6b1..8c1736ca8 100644 --- a/src/components/real/communication/antenna_radiation_pattern.hpp +++ b/src/components/real/communication/antenna_radiation_pattern.hpp @@ -6,7 +6,7 @@ #ifndef S2E_COMPONENTS_REAL_COMMUNICATION_ANTENNA_RADIATION_PATTERN_HPP_ #define S2E_COMPONENTS_REAL_COMMUNICATION_ANTENNA_RADIATION_PATTERN_HPP_ -#include +#include #include #include diff --git a/src/components/real/communication/ground_station_calculator.cpp b/src/components/real/communication/ground_station_calculator.cpp index 87a550529..c15570112 100644 --- a/src/components/real/communication/ground_station_calculator.cpp +++ b/src/components/real/communication/ground_station_calculator.cpp @@ -6,8 +6,8 @@ #include "ground_station_calculator.hpp" #include -#include -#include +#include +#include GroundStationCalculator::GroundStationCalculator(const double loss_polarization_dB, const double loss_atmosphere_dB, const double loss_rainfall_dB, const double loss_others_dB, const double ebn0_dB, const double hardware_deterioration_dB, diff --git a/src/components/real/communication/ground_station_calculator.hpp b/src/components/real/communication/ground_station_calculator.hpp index 196822295..a2d5eb75a 100644 --- a/src/components/real/communication/ground_station_calculator.hpp +++ b/src/components/real/communication/ground_station_calculator.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include /* diff --git a/src/components/real/communication/wings_command_sender_to_c2a.cpp b/src/components/real/communication/wings_command_sender_to_c2a.cpp index 2bb94ec0f..4d04ee911 100644 --- a/src/components/real/communication/wings_command_sender_to_c2a.cpp +++ b/src/components/real/communication/wings_command_sender_to_c2a.cpp @@ -7,9 +7,9 @@ #include "wings_command_sender_to_c2a.hpp" -#include -#include #include +#include +#include #ifdef USE_C2A #include "src_core/c2a_core_main.h" diff --git a/src/components/real/communication/wings_command_sender_to_c2a.hpp b/src/components/real/communication/wings_command_sender_to_c2a.hpp index d70964826..1ae74b1c1 100644 --- a/src/components/real/communication/wings_command_sender_to_c2a.hpp +++ b/src/components/real/communication/wings_command_sender_to_c2a.hpp @@ -6,8 +6,8 @@ #ifndef S2E_COMPONENTS_REAL_COMMUNICATION_C2A_COMMAND_SENDER_HPP_ #define S2E_COMPONENTS_REAL_COMMUNICATION_C2A_COMMAND_SENDER_HPP_ -#include -#include +#include +#include #include "../../base/component.hpp" diff --git a/src/components/real/mission/telescope.cpp b/src/components/real/mission/telescope.cpp index 21a8efb71..6112d2def 100644 --- a/src/components/real/mission/telescope.cpp +++ b/src/components/real/mission/telescope.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include using namespace std; using namespace libra; diff --git a/src/components/real/mission/telescope.hpp b/src/components/real/mission/telescope.hpp index 43dd5997f..6151c070e 100644 --- a/src/components/real/mission/telescope.hpp +++ b/src/components/real/mission/telescope.hpp @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include "../../base/component.hpp" diff --git a/src/components/real/power/battery.cpp b/src/components/real/power/battery.cpp index 072f55fc5..f647fb940 100644 --- a/src/components/real/power/battery.cpp +++ b/src/components/real/power/battery.cpp @@ -6,7 +6,7 @@ #include "battery.hpp" #include -#include +#include Battery::Battery(const int prescaler, ClockGenerator* clock_generator, int number_of_series, int number_of_parallel, double cell_capacity_Ah, const std::vector cell_discharge_curve_coefficients, double initial_dod, double cc_charge_c_rate, double cv_charge_voltage_V, diff --git a/src/components/real/power/battery.hpp b/src/components/real/power/battery.hpp index 555d87107..39ee34c44 100644 --- a/src/components/real/power/battery.hpp +++ b/src/components/real/power/battery.hpp @@ -6,7 +6,7 @@ #ifndef S2E_COMPONENTS_REAL_POWER_BATTERY_HPP_P_ #define S2E_COMPONENTS_REAL_POWER_BATTERY_HPP_P_ -#include +#include #include #include "../../base/component.hpp" diff --git a/src/components/real/power/csv_scenario_interface.cpp b/src/components/real/power/csv_scenario_interface.cpp index 1ed72c3d7..2f30e38a6 100644 --- a/src/components/real/power/csv_scenario_interface.cpp +++ b/src/components/real/power/csv_scenario_interface.cpp @@ -5,7 +5,7 @@ #include "csv_scenario_interface.hpp" -#include +#include bool CsvScenarioInterface::is_csv_scenario_enabled_; std::map CsvScenarioInterface::buffer_line_id_; diff --git a/src/components/real/power/csv_scenario_interface.hpp b/src/components/real/power/csv_scenario_interface.hpp index c98812a49..6e54f3d6f 100644 --- a/src/components/real/power/csv_scenario_interface.hpp +++ b/src/components/real/power/csv_scenario_interface.hpp @@ -6,8 +6,8 @@ #ifndef S2E_COMPONENTS_REAL_POWER_CSV_SCENARIO_INTERFACE_HPP_ #define S2E_COMPONENTS_REAL_POWER_CSV_SCENARIO_INTERFACE_HPP_ -#include #include +#include #include #include diff --git a/src/components/real/power/pcu_initial_study.cpp b/src/components/real/power/pcu_initial_study.cpp index d7249bd11..77f6fda37 100644 --- a/src/components/real/power/pcu_initial_study.cpp +++ b/src/components/real/power/pcu_initial_study.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include PcuInitialStudy::PcuInitialStudy(const int prescaler, ClockGenerator* clock_generator, const std::vector saps, Battery* battery, double component_step_time_s) diff --git a/src/components/real/power/pcu_initial_study.hpp b/src/components/real/power/pcu_initial_study.hpp index 33bc65a00..f59966774 100644 --- a/src/components/real/power/pcu_initial_study.hpp +++ b/src/components/real/power/pcu_initial_study.hpp @@ -6,7 +6,7 @@ #ifndef S2E_COMPONENTS_REAL_POWER_PCU_INITIAL_STUDY_HPP_ #define S2E_COMPONENTS_REAL_POWER_PCU_INITIAL_STUDY_HPP_ -#include +#include #include #include "../../base/component.hpp" diff --git a/src/components/real/power/power_control_unit.hpp b/src/components/real/power/power_control_unit.hpp index efb75b98e..94d66e7d6 100644 --- a/src/components/real/power/power_control_unit.hpp +++ b/src/components/real/power/power_control_unit.hpp @@ -7,7 +7,7 @@ #define S2E_COMPONENTS_REAL_POWER_POWER_CONTROL_UNIT_HPP_ #include -#include +#include #include #include "../../base/component.hpp" diff --git a/src/components/real/power/solar_array_panel.cpp b/src/components/real/power/solar_array_panel.cpp index b693e36e6..3ea0df5e9 100644 --- a/src/components/real/power/solar_array_panel.cpp +++ b/src/components/real/power/solar_array_panel.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include SolarArrayPanel::SolarArrayPanel(const int prescaler, ClockGenerator* clock_generator, int component_id, int number_of_series, int number_of_parallel, double cell_area_m2, libra::Vector<3> normal_vector, double cell_efficiency, double transmission_efficiency, diff --git a/src/components/real/power/solar_array_panel.hpp b/src/components/real/power/solar_array_panel.hpp index d4db31217..e7150e911 100644 --- a/src/components/real/power/solar_array_panel.hpp +++ b/src/components/real/power/solar_array_panel.hpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include "../../base/component.hpp" diff --git a/src/components/real/propulsion/simple_thruster.cpp b/src/components/real/propulsion/simple_thruster.cpp index 31078a501..252204cda 100644 --- a/src/components/real/propulsion/simple_thruster.cpp +++ b/src/components/real/propulsion/simple_thruster.cpp @@ -5,9 +5,9 @@ #include "simple_thruster.hpp" #include -#include -#include -#include +#include +#include +#include // Constructor SimpleThruster::SimpleThruster(const int prescaler, ClockGenerator* clock_generator, const int component_id, diff --git a/src/components/real/propulsion/simple_thruster.hpp b/src/components/real/propulsion/simple_thruster.hpp index 37496490f..cbceafc71 100644 --- a/src/components/real/propulsion/simple_thruster.hpp +++ b/src/components/real/propulsion/simple_thruster.hpp @@ -7,10 +7,10 @@ #define S2E_COMPONENTS_REAL_PROPULSION_SIMPLE_THRUSTER_HPP_ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "../../base/component.hpp" diff --git a/src/disturbances/air_drag.cpp b/src/disturbances/air_drag.cpp index df23967a7..c3df5cc19 100644 --- a/src/disturbances/air_drag.cpp +++ b/src/disturbances/air_drag.cpp @@ -7,10 +7,10 @@ #include #include -#include -#include +#include +#include -#include "../library/logger/log_utility.hpp" +#include "../logger/log_utility.hpp" AirDrag::AirDrag(const std::vector& surfaces, const libra::Vector<3>& center_of_gravity_b_m, const double wall_temperature_K, const double molecular_temperature_K, const double molecular_weight_g_mol, const bool is_calculation_enabled) diff --git a/src/disturbances/air_drag.hpp b/src/disturbances/air_drag.hpp index a1ca68dff..b794cd3b4 100644 --- a/src/disturbances/air_drag.hpp +++ b/src/disturbances/air_drag.hpp @@ -9,9 +9,9 @@ #include #include "../environment/local/atmosphere.hpp" -#include "../library/logger/loggable.hpp" -#include "../library/math/quaternion.hpp" -#include "../library/math/vector.hpp" +#include "../logger/loggable.hpp" +#include "../math_physics/math/quaternion.hpp" +#include "../math_physics/math/vector.hpp" #include "surface_force.hpp" /** diff --git a/src/disturbances/disturbance.hpp b/src/disturbances/disturbance.hpp index f43285374..c898f18f0 100644 --- a/src/disturbances/disturbance.hpp +++ b/src/disturbances/disturbance.hpp @@ -7,7 +7,7 @@ #define S2E_DISTURBANCES_DISTURBANCE_HPP_ #include "../environment/local/local_environment.hpp" -#include "../library/math/vector.hpp" +#include "../math_physics/math/vector.hpp" /** * @class Disturbance diff --git a/src/disturbances/disturbances.cpp b/src/disturbances/disturbances.cpp index 709200464..682790896 100644 --- a/src/disturbances/disturbances.cpp +++ b/src/disturbances/disturbances.cpp @@ -5,7 +5,7 @@ #include "disturbances.hpp" -#include +#include #include "air_drag.hpp" #include "geopotential.hpp" diff --git a/src/disturbances/geopotential.cpp b/src/disturbances/geopotential.cpp index 39b3e4300..7be1ceba6 100644 --- a/src/disturbances/geopotential.cpp +++ b/src/disturbances/geopotential.cpp @@ -10,10 +10,10 @@ #include #include #include -#include +#include -#include "../library/logger/log_utility.hpp" -#include "../library/utilities/macros.hpp" +#include "../logger/log_utility.hpp" +#include "../utilities/macros.hpp" // #define DEBUG_GEOPOTENTIAL diff --git a/src/disturbances/geopotential.hpp b/src/disturbances/geopotential.hpp index abe79028d..1360183fb 100644 --- a/src/disturbances/geopotential.hpp +++ b/src/disturbances/geopotential.hpp @@ -8,8 +8,8 @@ #include -#include "../library/gravity/gravity_potential.hpp" -#include "../library/math/vector.hpp" +#include "../math_physics/gravity/gravity_potential.hpp" +#include "../math_physics/math/vector.hpp" #include "disturbance.hpp" /** * @class Geopotential diff --git a/src/disturbances/gravity_gradient.cpp b/src/disturbances/gravity_gradient.cpp index 2efbd14a1..d59c02dbd 100644 --- a/src/disturbances/gravity_gradient.cpp +++ b/src/disturbances/gravity_gradient.cpp @@ -7,9 +7,9 @@ #include #include -#include +#include -#include "../library/logger/log_utility.hpp" +#include "../logger/log_utility.hpp" GravityGradient::GravityGradient(const bool is_calculation_enabled) : GravityGradient(environment::earth_gravitational_constant_m3_s2, is_calculation_enabled) {} diff --git a/src/disturbances/gravity_gradient.hpp b/src/disturbances/gravity_gradient.hpp index 400027442..c43b328e8 100644 --- a/src/disturbances/gravity_gradient.hpp +++ b/src/disturbances/gravity_gradient.hpp @@ -8,10 +8,10 @@ #include -#include "../library/logger/loggable.hpp" -#include "../library/math/matrix.hpp" -#include "../library/math/matrix_vector.hpp" -#include "../library/math/vector.hpp" +#include "../logger/loggable.hpp" +#include "../math_physics/math/matrix.hpp" +#include "../math_physics/math/matrix_vector.hpp" +#include "../math_physics/math/vector.hpp" #include "disturbance.hpp" /** diff --git a/src/disturbances/lunar_gravity_field.cpp b/src/disturbances/lunar_gravity_field.cpp index 26adc70ad..8de4db364 100644 --- a/src/disturbances/lunar_gravity_field.cpp +++ b/src/disturbances/lunar_gravity_field.cpp @@ -10,10 +10,10 @@ #include #include #include -#include +#include -#include "../library/logger/log_utility.hpp" -#include "../library/utilities/macros.hpp" +#include "../logger/log_utility.hpp" +#include "../utilities/macros.hpp" // #define DEBUG_LUNAR_GRAVITY_FIELD diff --git a/src/disturbances/lunar_gravity_field.hpp b/src/disturbances/lunar_gravity_field.hpp index 13f1b9f22..61c592ab3 100644 --- a/src/disturbances/lunar_gravity_field.hpp +++ b/src/disturbances/lunar_gravity_field.hpp @@ -8,8 +8,8 @@ #include -#include "../library/gravity/gravity_potential.hpp" -#include "../library/math/vector.hpp" +#include "../math_physics/gravity/gravity_potential.hpp" +#include "../math_physics/math/vector.hpp" #include "disturbance.hpp" /** * @class LunarGravityField diff --git a/src/disturbances/magnetic_disturbance.cpp b/src/disturbances/magnetic_disturbance.cpp index 8e9fe05b3..0dce38b1e 100644 --- a/src/disturbances/magnetic_disturbance.cpp +++ b/src/disturbances/magnetic_disturbance.cpp @@ -5,13 +5,13 @@ #include "magnetic_disturbance.hpp" -#include -#include +#include +#include -#include "../library/logger/log_utility.hpp" -#include "../library/randomization/global_randomization.hpp" -#include "../library/randomization/normal_randomization.hpp" -#include "../library/randomization/random_walk.hpp" +#include "../logger/log_utility.hpp" +#include "../math_physics/randomization/global_randomization.hpp" +#include "../math_physics/randomization/normal_randomization.hpp" +#include "../math_physics/randomization/random_walk.hpp" MagneticDisturbance::MagneticDisturbance(const ResidualMagneticMoment& rmm_params, const bool is_calculation_enabled) : Disturbance(is_calculation_enabled, true), residual_magnetic_moment_(rmm_params) { diff --git a/src/disturbances/magnetic_disturbance.hpp b/src/disturbances/magnetic_disturbance.hpp index c60bf8a40..d056cc43f 100644 --- a/src/disturbances/magnetic_disturbance.hpp +++ b/src/disturbances/magnetic_disturbance.hpp @@ -8,8 +8,8 @@ #include -#include "../library/logger/loggable.hpp" -#include "../library/math/vector.hpp" +#include "../logger/loggable.hpp" +#include "../math_physics/math/vector.hpp" #include "../simulation/spacecraft/structure/residual_magnetic_moment.hpp" #include "disturbance.hpp" diff --git a/src/disturbances/solar_radiation_pressure_disturbance.cpp b/src/disturbances/solar_radiation_pressure_disturbance.cpp index 711a52cec..3ecd0ca8d 100644 --- a/src/disturbances/solar_radiation_pressure_disturbance.cpp +++ b/src/disturbances/solar_radiation_pressure_disturbance.cpp @@ -6,9 +6,9 @@ #include "solar_radiation_pressure_disturbance.hpp" #include -#include +#include -#include "../library/logger/log_utility.hpp" +#include "../logger/log_utility.hpp" SolarRadiationPressureDisturbance::SolarRadiationPressureDisturbance(const std::vector& surfaces, const libra::Vector<3>& center_of_gravity_b_m, const bool is_calculation_enabled) diff --git a/src/disturbances/solar_radiation_pressure_disturbance.hpp b/src/disturbances/solar_radiation_pressure_disturbance.hpp index 7db45f45a..5dc04a51c 100644 --- a/src/disturbances/solar_radiation_pressure_disturbance.hpp +++ b/src/disturbances/solar_radiation_pressure_disturbance.hpp @@ -6,10 +6,10 @@ #ifndef S2E_DISTURBANCES_SOLAR_RADIATION_PRESSURE_DISTURBANCE_HPP_ #define S2E_DISTURBANCES_SOLAR_RADIATION_PRESSURE_DISTURBANCE_HPP_ -#include +#include -#include "../library/logger/loggable.hpp" -#include "../library/math/vector.hpp" +#include "../logger/loggable.hpp" +#include "../math_physics/math/vector.hpp" #include "surface_force.hpp" /** diff --git a/src/disturbances/surface_force.cpp b/src/disturbances/surface_force.cpp index e6dce0716..8cf5c7278 100644 --- a/src/disturbances/surface_force.cpp +++ b/src/disturbances/surface_force.cpp @@ -5,7 +5,7 @@ #include "surface_force.hpp" -#include "../library/math/vector.hpp" +#include "../math_physics/math/vector.hpp" SurfaceForce::SurfaceForce(const std::vector& surfaces, const libra::Vector<3>& center_of_gravity_b_m, const bool is_calculation_enabled) : Disturbance(is_calculation_enabled, true), surfaces_(surfaces), center_of_gravity_b_m_(center_of_gravity_b_m) { diff --git a/src/disturbances/surface_force.hpp b/src/disturbances/surface_force.hpp index ad82c9fba..b07b7101f 100644 --- a/src/disturbances/surface_force.hpp +++ b/src/disturbances/surface_force.hpp @@ -10,8 +10,8 @@ #include -#include "../library/math/quaternion.hpp" -#include "../library/math/vector.hpp" +#include "../math_physics/math/quaternion.hpp" +#include "../math_physics/math/vector.hpp" #include "../simulation/spacecraft/structure/surface.hpp" #include "disturbance.hpp" diff --git a/src/disturbances/third_body_gravity.cpp b/src/disturbances/third_body_gravity.cpp index b7ed2ed63..86917898d 100644 --- a/src/disturbances/third_body_gravity.cpp +++ b/src/disturbances/third_body_gravity.cpp @@ -5,7 +5,7 @@ #include "third_body_gravity.hpp" -#include +#include ThirdBodyGravity::ThirdBodyGravity(std::set third_body_list, const bool is_calculation_enabled) : Disturbance(is_calculation_enabled, false), third_body_list_(third_body_list) { diff --git a/src/disturbances/third_body_gravity.hpp b/src/disturbances/third_body_gravity.hpp index b244660ac..564a823ce 100644 --- a/src/disturbances/third_body_gravity.hpp +++ b/src/disturbances/third_body_gravity.hpp @@ -10,8 +10,8 @@ #include #include -#include "../library/logger/loggable.hpp" -#include "../library/math/vector.hpp" +#include "../logger/loggable.hpp" +#include "../math_physics/math/vector.hpp" #include "disturbance.hpp" /** diff --git a/src/dynamics/attitude/attitude.cpp b/src/dynamics/attitude/attitude.cpp index b96e0f6bd..fa73b6c98 100644 --- a/src/dynamics/attitude/attitude.cpp +++ b/src/dynamics/attitude/attitude.cpp @@ -4,7 +4,7 @@ */ #include "attitude.hpp" -#include +#include Attitude::Attitude(const libra::Matrix<3, 3>& inertia_tensor_kgm2, const std::string& simulation_object_name) : SimulationObject(simulation_object_name), inertia_tensor_kgm2_(inertia_tensor_kgm2) { diff --git a/src/dynamics/attitude/attitude.hpp b/src/dynamics/attitude/attitude.hpp index 2b88b19be..54f63def9 100644 --- a/src/dynamics/attitude/attitude.hpp +++ b/src/dynamics/attitude/attitude.hpp @@ -6,9 +6,9 @@ #ifndef S2E_DYNAMICS_ATTITUDE_ATTITUDE_HPP_ #define S2E_DYNAMICS_ATTITUDE_ATTITUDE_HPP_ -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/dynamics/attitude/attitude_rk4.cpp b/src/dynamics/attitude/attitude_rk4.cpp index c419229ad..669b3b61c 100644 --- a/src/dynamics/attitude/attitude_rk4.cpp +++ b/src/dynamics/attitude/attitude_rk4.cpp @@ -5,9 +5,9 @@ #include "attitude_rk4.hpp" #include -#include -#include +#include #include +#include AttitudeRk4::AttitudeRk4(const libra::Vector<3>& angular_velocity_b_rad_s, const libra::Quaternion& quaternion_i2b, const libra::Matrix<3, 3>& inertia_tensor_kgm2, const libra::Vector<3>& torque_b_Nm, const double propagation_step_s, diff --git a/src/dynamics/attitude/controlled_attitude.cpp b/src/dynamics/attitude/controlled_attitude.cpp index 6e23416c4..a77002962 100644 --- a/src/dynamics/attitude/controlled_attitude.cpp +++ b/src/dynamics/attitude/controlled_attitude.cpp @@ -4,8 +4,8 @@ */ #include "controlled_attitude.hpp" -#include -#include +#include +#include ControlledAttitude::ControlledAttitude(const AttitudeControlMode main_mode, const AttitudeControlMode sub_mode, const libra::Quaternion quaternion_i2b, const libra::Vector<3> main_target_direction_b, diff --git a/src/dynamics/attitude/controlled_attitude.hpp b/src/dynamics/attitude/controlled_attitude.hpp index 29909753b..dbc7debe1 100644 --- a/src/dynamics/attitude/controlled_attitude.hpp +++ b/src/dynamics/attitude/controlled_attitude.hpp @@ -7,7 +7,7 @@ #define S2E_DYNAMICS_ATTITUDE_CONTROLLED_ATTITUDE_HPP_ #include -#include +#include #include #include "../orbit/orbit.hpp" diff --git a/src/dynamics/attitude/initialize_attitude.cpp b/src/dynamics/attitude/initialize_attitude.cpp index ed0e00511..da7fd02ab 100644 --- a/src/dynamics/attitude/initialize_attitude.cpp +++ b/src/dynamics/attitude/initialize_attitude.cpp @@ -4,7 +4,7 @@ */ #include "initialize_attitude.hpp" -#include +#include Attitude* InitAttitude(std::string file_name, const Orbit* orbit, const LocalCelestialInformation* local_celestial_information, const double step_width_s, const libra::Matrix<3, 3>& inertia_tensor_kgm2, const int spacecraft_id) { diff --git a/src/dynamics/dynamics.hpp b/src/dynamics/dynamics.hpp index a6b5044f1..e8a366555 100644 --- a/src/dynamics/dynamics.hpp +++ b/src/dynamics/dynamics.hpp @@ -9,7 +9,7 @@ #include "../environment/global/simulation_time.hpp" #include "../environment/local/local_environment.hpp" -#include "../library/math/vector.hpp" +#include "../math_physics/math/vector.hpp" #include "../simulation/simulation_configuration.hpp" #include "../simulation/spacecraft/structure/structure.hpp" #include "dynamics/attitude/initialize_attitude.hpp" diff --git a/src/dynamics/orbit/encke_orbit_propagation.cpp b/src/dynamics/orbit/encke_orbit_propagation.cpp index 941665edf..55dd09adc 100644 --- a/src/dynamics/orbit/encke_orbit_propagation.cpp +++ b/src/dynamics/orbit/encke_orbit_propagation.cpp @@ -5,9 +5,9 @@ #include "encke_orbit_propagation.hpp" -#include +#include -#include "../../library/orbit/orbital_elements.hpp" +#include "../../math_physics/orbit/orbital_elements.hpp" EnckeOrbitPropagation::EnckeOrbitPropagation(const CelestialInformation* celestial_information, const double gravity_constant_m3_s2, const double propagation_step_s, const double current_time_jd, const libra::Vector<3> position_i_m, diff --git a/src/dynamics/orbit/encke_orbit_propagation.hpp b/src/dynamics/orbit/encke_orbit_propagation.hpp index 03d42f696..f8648730a 100644 --- a/src/dynamics/orbit/encke_orbit_propagation.hpp +++ b/src/dynamics/orbit/encke_orbit_propagation.hpp @@ -6,8 +6,8 @@ #ifndef S2E_DYNAMICS_ORBIT_ENCKE_ORBIT_PROPAGATION_HPP_ #define S2E_DYNAMICS_ORBIT_ENCKE_ORBIT_PROPAGATION_HPP_ -#include "../../library/math/ordinary_differential_equation.hpp" -#include "../../library/orbit/kepler_orbit.hpp" +#include "../../math_physics/math/ordinary_differential_equation.hpp" +#include "../../math_physics/orbit/kepler_orbit.hpp" #include "orbit.hpp" /** diff --git a/src/dynamics/orbit/initialize_orbit.cpp b/src/dynamics/orbit/initialize_orbit.cpp index c05b3f6bf..4ab11afdb 100644 --- a/src/dynamics/orbit/initialize_orbit.cpp +++ b/src/dynamics/orbit/initialize_orbit.cpp @@ -4,7 +4,7 @@ */ #include "initialize_orbit.hpp" -#include +#include #include "encke_orbit_propagation.hpp" #include "kepler_orbit_propagation.hpp" diff --git a/src/dynamics/orbit/initialize_orbit.hpp b/src/dynamics/orbit/initialize_orbit.hpp index 442b5ff72..e2b8363a8 100644 --- a/src/dynamics/orbit/initialize_orbit.hpp +++ b/src/dynamics/orbit/initialize_orbit.hpp @@ -6,7 +6,7 @@ #ifndef S2E_DYNAMICS_ORBIT_INITIALIZE_ORBIT_HPP_ #define S2E_DYNAMICS_ORBIT_INITIALIZE_ORBIT_HPP_ -#include +#include #include "orbit.hpp" diff --git a/src/dynamics/orbit/kepler_orbit_propagation.cpp b/src/dynamics/orbit/kepler_orbit_propagation.cpp index 776c468d2..905c56e39 100644 --- a/src/dynamics/orbit/kepler_orbit_propagation.cpp +++ b/src/dynamics/orbit/kepler_orbit_propagation.cpp @@ -4,9 +4,9 @@ */ #include "kepler_orbit_propagation.hpp" -#include +#include -#include "../../library/math/s2e_math.hpp" +#include "../../math_physics/math/s2e_math.hpp" KeplerOrbitPropagation::KeplerOrbitPropagation(const CelestialInformation* celestial_information, const double current_time_jd, KeplerOrbit kepler_orbit) diff --git a/src/dynamics/orbit/kepler_orbit_propagation.hpp b/src/dynamics/orbit/kepler_orbit_propagation.hpp index bed2bf624..f2421003e 100644 --- a/src/dynamics/orbit/kepler_orbit_propagation.hpp +++ b/src/dynamics/orbit/kepler_orbit_propagation.hpp @@ -6,7 +6,7 @@ #ifndef S2E_DYNAMICS_ORBIT_KEPLER_ORBIT_PROPAGATION_HPP_ #define S2E_DYNAMICS_ORBIT_KEPLER_ORBIT_PROPAGATION_HPP_ -#include "../../library/orbit/kepler_orbit.hpp" +#include "../../math_physics/orbit/kepler_orbit.hpp" #include "orbit.hpp" /** diff --git a/src/dynamics/orbit/orbit.hpp b/src/dynamics/orbit/orbit.hpp index 591f79ee8..6ddcfe289 100644 --- a/src/dynamics/orbit/orbit.hpp +++ b/src/dynamics/orbit/orbit.hpp @@ -8,13 +8,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /** * @enum OrbitPropagateMode diff --git a/src/dynamics/orbit/relative_orbit.cpp b/src/dynamics/orbit/relative_orbit.cpp index 347e07e87..402129504 100644 --- a/src/dynamics/orbit/relative_orbit.cpp +++ b/src/dynamics/orbit/relative_orbit.cpp @@ -4,7 +4,7 @@ */ #include "relative_orbit.hpp" -#include +#include #include "rk4_orbit_propagation.hpp" diff --git a/src/dynamics/orbit/relative_orbit.hpp b/src/dynamics/orbit/relative_orbit.hpp index 09b8d1403..f7445d101 100644 --- a/src/dynamics/orbit/relative_orbit.hpp +++ b/src/dynamics/orbit/relative_orbit.hpp @@ -6,8 +6,8 @@ #ifndef S2E_DYNAMICS_ORBIT_RELATIVE_ORBIT_HPP_ #define S2E_DYNAMICS_ORBIT_RELATIVE_ORBIT_HPP_ -#include -#include +#include +#include #include #include diff --git a/src/dynamics/orbit/rk4_orbit_propagation.cpp b/src/dynamics/orbit/rk4_orbit_propagation.cpp index 683db283b..ff14b33cc 100644 --- a/src/dynamics/orbit/rk4_orbit_propagation.cpp +++ b/src/dynamics/orbit/rk4_orbit_propagation.cpp @@ -5,8 +5,8 @@ #include "rk4_orbit_propagation.hpp" #include -#include #include +#include Rk4OrbitPropagation::Rk4OrbitPropagation(const CelestialInformation* celestial_information, double gravity_constant_m3_s2, double time_step_s, libra::Vector<3> position_i_m, libra::Vector<3> velocity_i_m_s, double initial_time_s) diff --git a/src/dynamics/orbit/rk4_orbit_propagation.hpp b/src/dynamics/orbit/rk4_orbit_propagation.hpp index bdb98b808..253a3178b 100644 --- a/src/dynamics/orbit/rk4_orbit_propagation.hpp +++ b/src/dynamics/orbit/rk4_orbit_propagation.hpp @@ -7,7 +7,7 @@ #define S2E_DYNAMICS_ORBIT_RK4_ORBIT_PROPAGATION_HPP_ #include -#include +#include #include "orbit.hpp" diff --git a/src/dynamics/orbit/sgp4_orbit_propagation.cpp b/src/dynamics/orbit/sgp4_orbit_propagation.cpp index 1c4da13ee..30451f568 100644 --- a/src/dynamics/orbit/sgp4_orbit_propagation.cpp +++ b/src/dynamics/orbit/sgp4_orbit_propagation.cpp @@ -6,8 +6,8 @@ #include "sgp4_orbit_propagation.hpp" #include -#include #include +#include Sgp4OrbitPropagation::Sgp4OrbitPropagation(const CelestialInformation* celestial_information, char* tle1, char* tle2, const int wgs_setting, const double current_time_jd) diff --git a/src/dynamics/orbit/sgp4_orbit_propagation.hpp b/src/dynamics/orbit/sgp4_orbit_propagation.hpp index 3ed68fbf9..42b69681c 100644 --- a/src/dynamics/orbit/sgp4_orbit_propagation.hpp +++ b/src/dynamics/orbit/sgp4_orbit_propagation.hpp @@ -6,8 +6,8 @@ #ifndef S2E_DYNAMICS_ORBIT_SGP4_ORBIT_PROPAGATION_HPP_ #define S2E_DYNAMICS_ORBIT_SGP4_ORBIT_PROPAGATION_HPP_ -#include -#include +#include +#include #include @@ -41,8 +41,8 @@ class Sgp4OrbitPropagation : public Orbit { virtual void Propagate(const double end_time_s, const double current_time_jd); private: - gravconsttype gravity_constant_setting_; //!< Gravity constant value type - elsetrec sgp4_data_; //!< Structure data for SGP4 library + gravconsttype gravity_constant_setting_; //!< Gravity constant value type + elsetrec sgp4_data_; //!< Structure data for SGP4 library }; #endif // S2E_DYNAMICS_ORBIT_SGP4_ORBIT_PROPAGATION_HPP_ diff --git a/src/dynamics/thermal/heater.hpp b/src/dynamics/thermal/heater.hpp index 9ea964f73..4b4b86170 100644 --- a/src/dynamics/thermal/heater.hpp +++ b/src/dynamics/thermal/heater.hpp @@ -7,7 +7,7 @@ #define S2E_DYNAMICS_THERMAL_HEATER_HPP_ #include -#include +#include #include #include diff --git a/src/dynamics/thermal/heater_controller.hpp b/src/dynamics/thermal/heater_controller.hpp index 347d8809e..60578d9d4 100644 --- a/src/dynamics/thermal/heater_controller.hpp +++ b/src/dynamics/thermal/heater_controller.hpp @@ -7,7 +7,7 @@ #define S2E_DYNAMICS_THERMAL_HEATER_CONTROLLER_HPP_ #include -#include +#include #include #include diff --git a/src/dynamics/thermal/heatload.hpp b/src/dynamics/thermal/heatload.hpp index 1851f24c2..3623ea4c4 100644 --- a/src/dynamics/thermal/heatload.hpp +++ b/src/dynamics/thermal/heatload.hpp @@ -6,7 +6,7 @@ #ifndef S2E_DYNAMICS_THERMAL_HEATLOAD_HPP_ #define S2E_DYNAMICS_THERMAL_HEATLOAD_HPP_ -#include +#include #include #include diff --git a/src/dynamics/thermal/node.hpp b/src/dynamics/thermal/node.hpp index 0de19fb8a..23640a13a 100644 --- a/src/dynamics/thermal/node.hpp +++ b/src/dynamics/thermal/node.hpp @@ -7,7 +7,7 @@ #define S2E_DYNAMICS_THERMAL_NODE_HPP_ #include -#include +#include #include #include diff --git a/src/dynamics/thermal/temperature.cpp b/src/dynamics/thermal/temperature.cpp index 9b1b37d89..deb464820 100644 --- a/src/dynamics/thermal/temperature.cpp +++ b/src/dynamics/thermal/temperature.cpp @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include using namespace std; diff --git a/src/dynamics/thermal/temperature.hpp b/src/dynamics/thermal/temperature.hpp index b45a8edd2..2b9105217 100644 --- a/src/dynamics/thermal/temperature.hpp +++ b/src/dynamics/thermal/temperature.hpp @@ -7,7 +7,7 @@ #define S2E_DYNAMICS_THERMAL_TEMPERATURE_HPP_ #include -#include +#include #include #include diff --git a/src/environment/global/celestial_information.cpp b/src/environment/global/celestial_information.cpp index 9e7a2c71a..c51461e92 100644 --- a/src/environment/global/celestial_information.cpp +++ b/src/environment/global/celestial_information.cpp @@ -15,8 +15,8 @@ #include #include -#include "library/initialize/initialize_file_access.hpp" -#include "library/logger/log_utility.hpp" +#include "logger/log_utility.hpp" +#include "setting_file_reader/initialize_file_access.hpp" CelestialInformation::CelestialInformation(const std::string inertial_frame_name, const std::string aberration_correction_setting, const std::string center_body_name, const unsigned int number_of_selected_body, int* selected_body_ids, diff --git a/src/environment/global/celestial_information.hpp b/src/environment/global/celestial_information.hpp index 3f897f17d..676ed1ce8 100644 --- a/src/environment/global/celestial_information.hpp +++ b/src/environment/global/celestial_information.hpp @@ -10,8 +10,8 @@ #include #include "earth_rotation.hpp" -#include "library/logger/loggable.hpp" -#include "library/math/vector.hpp" +#include "logger/loggable.hpp" +#include "math_physics/math/vector.hpp" #include "moon_rotation.hpp" #include "simulation_time.hpp" diff --git a/src/environment/global/earth_rotation.cpp b/src/environment/global/earth_rotation.cpp index 2f8218dde..569c4a293 100644 --- a/src/environment/global/earth_rotation.cpp +++ b/src/environment/global/earth_rotation.cpp @@ -11,9 +11,9 @@ #include #include -#include "library/external/sgp4/sgp4ext.h" // for jday() -#include "library/external/sgp4/sgp4unit.h" // for gstime() -#include "library/math/constants.hpp" +#include "math_physics/math/constants.hpp" +#include "math_physics/orbit/sgp4/sgp4ext.h" // for jday() +#include "math_physics/orbit/sgp4/sgp4unit.h" // for gstime() // Default constructor EarthRotation::EarthRotation(const EarthRotationMode rotation_mode) : rotation_mode_(rotation_mode) { diff --git a/src/environment/global/earth_rotation.hpp b/src/environment/global/earth_rotation.hpp index c6adaa685..118e55818 100644 --- a/src/environment/global/earth_rotation.hpp +++ b/src/environment/global/earth_rotation.hpp @@ -9,7 +9,7 @@ #ifndef S2E_ENVIRONMENT_GLOBAL_EARTH_ROTATION_HPP_ #define S2E_ENVIRONMENT_GLOBAL_EARTH_ROTATION_HPP_ -#include "library/math/matrix.hpp" +#include "math_physics/math/matrix.hpp" /** * @enum EarthRotationMode diff --git a/src/environment/global/global_environment.cpp b/src/environment/global/global_environment.cpp index cce9a8442..0e89b2346 100644 --- a/src/environment/global/global_environment.cpp +++ b/src/environment/global/global_environment.cpp @@ -5,7 +5,7 @@ #include "global_environment.hpp" -#include "library/initialize/initialize_file_access.hpp" +#include "setting_file_reader/initialize_file_access.hpp" GlobalEnvironment::GlobalEnvironment(const SimulationConfiguration* simulation_configuration) { Initialize(simulation_configuration); } diff --git a/src/environment/global/global_environment.hpp b/src/environment/global/global_environment.hpp index 1b1483757..b8bb56890 100644 --- a/src/environment/global/global_environment.hpp +++ b/src/environment/global/global_environment.hpp @@ -9,7 +9,7 @@ #include "celestial_information.hpp" #include "gnss_satellites.hpp" #include "hipparcos_catalogue.hpp" -#include "library/logger/logger.hpp" +#include "logger/logger.hpp" #include "simulation/simulation_configuration.hpp" #include "simulation_time.hpp" diff --git a/src/environment/global/gnss_satellites.cpp b/src/environment/global/gnss_satellites.cpp index 7892b1e0e..1ecf7c6a7 100644 --- a/src/environment/global/gnss_satellites.cpp +++ b/src/environment/global/gnss_satellites.cpp @@ -5,15 +5,15 @@ #include "gnss_satellites.hpp" -#include -#include +#include +#include #include "environment/global/physical_constants.hpp" -#include "library/initialize/initialize_file_access.hpp" -#include "library/logger/log_utility.hpp" -#include "library/math/constants.hpp" -#include "library/time_system/date_time_format.hpp" -#include "library/utilities/macros.hpp" +#include "logger/log_utility.hpp" +#include "math_physics/math/constants.hpp" +#include "math_physics/time_system/date_time_format.hpp" +#include "setting_file_reader/initialize_file_access.hpp" +#include "utilities/macros.hpp" const size_t kNumberOfInterpolation = 9; diff --git a/src/environment/global/gnss_satellites.hpp b/src/environment/global/gnss_satellites.hpp index 643afe52f..533af1a26 100644 --- a/src/environment/global/gnss_satellites.hpp +++ b/src/environment/global/gnss_satellites.hpp @@ -7,18 +7,18 @@ #ifndef S2E_ENVIRONMENT_GLOBAL_GNSS_SATELLITES_HPP_ #define S2E_ENVIRONMENT_GLOBAL_GNSS_SATELLITES_HPP_ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include "earth_rotation.hpp" -#include "library/gnss/gnss_satellite_number.hpp" -#include "library/logger/loggable.hpp" -#include "library/math/vector.hpp" +#include "logger/loggable.hpp" +#include "math_physics/gnss/gnss_satellite_number.hpp" +#include "math_physics/math/vector.hpp" #include "simulation_time.hpp" /** diff --git a/src/environment/global/hipparcos_catalogue.cpp b/src/environment/global/hipparcos_catalogue.cpp index 0ea5de6d0..5ab550fe7 100644 --- a/src/environment/global/hipparcos_catalogue.cpp +++ b/src/environment/global/hipparcos_catalogue.cpp @@ -11,8 +11,8 @@ #include #include -#include "library/initialize/initialize_file_access.hpp" -#include "library/math/constants.hpp" +#include "math_physics/math/constants.hpp" +#include "setting_file_reader/initialize_file_access.hpp" HipparcosCatalogue::HipparcosCatalogue(double max_magnitude, std::string catalogue_path) : max_magnitude_(max_magnitude), catalogue_path_(catalogue_path) {} diff --git a/src/environment/global/hipparcos_catalogue.hpp b/src/environment/global/hipparcos_catalogue.hpp index f22bd7c87..a1b9540a3 100644 --- a/src/environment/global/hipparcos_catalogue.hpp +++ b/src/environment/global/hipparcos_catalogue.hpp @@ -8,9 +8,9 @@ #include -#include "library/logger/loggable.hpp" -#include "library/math/quaternion.hpp" -#include "library/math/vector.hpp" +#include "logger/loggable.hpp" +#include "math_physics/math/quaternion.hpp" +#include "math_physics/math/vector.hpp" /** *@struct HipparcosData diff --git a/src/environment/global/moon_rotation.cpp b/src/environment/global/moon_rotation.cpp index 75ede8b33..d80c4adf3 100644 --- a/src/environment/global/moon_rotation.cpp +++ b/src/environment/global/moon_rotation.cpp @@ -7,8 +7,8 @@ #include -#include -#include +#include +#include MoonRotation::MoonRotation(const CelestialInformation& celestial_information, MoonRotationMode mode) : mode_(mode), celestial_information_(celestial_information) { diff --git a/src/environment/global/moon_rotation.hpp b/src/environment/global/moon_rotation.hpp index 74d8eb64e..754f6fde4 100644 --- a/src/environment/global/moon_rotation.hpp +++ b/src/environment/global/moon_rotation.hpp @@ -7,8 +7,8 @@ #define S2E_ENVIRONMENT_GLOBAL_MOON_ROTATION_HPP_ #include "celestial_information.hpp" -#include "library/math/matrix.hpp" -#include "library/math/vector.hpp" +#include "math_physics/math/matrix.hpp" +#include "math_physics/math/vector.hpp" #include "simulation_time.hpp" class CelestialInformation; diff --git a/src/environment/global/simulation_time.cpp b/src/environment/global/simulation_time.cpp index 5872ad1c1..149b88f42 100644 --- a/src/environment/global/simulation_time.cpp +++ b/src/environment/global/simulation_time.cpp @@ -12,7 +12,7 @@ #include #include -#include "library/initialize/initialize_file_access.hpp" +#include "setting_file_reader/initialize_file_access.hpp" #ifdef WIN32 #include #else diff --git a/src/environment/global/simulation_time.hpp b/src/environment/global/simulation_time.hpp index 26c407c7b..f993b5ec8 100644 --- a/src/environment/global/simulation_time.hpp +++ b/src/environment/global/simulation_time.hpp @@ -14,10 +14,10 @@ // #include #include -#include "library/external/sgp4/sgp4ext.h" -#include "library/external/sgp4/sgp4io.h" -#include "library/external/sgp4/sgp4unit.h" -#include "library/logger/loggable.hpp" +#include "logger/loggable.hpp" +#include "math_physics/orbit/sgp4/sgp4ext.h" +#include "math_physics/orbit/sgp4/sgp4io.h" +#include "math_physics/orbit/sgp4/sgp4unit.h" /** *@struct TimeState diff --git a/src/environment/local/atmosphere.cpp b/src/environment/local/atmosphere.cpp index 5d57621af..87fbdbabc 100644 --- a/src/environment/local/atmosphere.cpp +++ b/src/environment/local/atmosphere.cpp @@ -5,14 +5,14 @@ #include "atmosphere.hpp" -#include "library/atmosphere/harris_priester_model.hpp" -#include "library/atmosphere/simple_air_density_model.hpp" -#include "library/initialize/initialize_file_access.hpp" -#include "library/logger/log_utility.hpp" -#include "library/math/vector.hpp" -#include "library/randomization/global_randomization.hpp" -#include "library/randomization/normal_randomization.hpp" -#include "library/randomization/random_walk.hpp" +#include "logger/log_utility.hpp" +#include "math_physics/atmosphere/harris_priester_model.hpp" +#include "math_physics/atmosphere/simple_air_density_model.hpp" +#include "math_physics/math/vector.hpp" +#include "math_physics/randomization/global_randomization.hpp" +#include "math_physics/randomization/normal_randomization.hpp" +#include "math_physics/randomization/random_walk.hpp" +#include "setting_file_reader/initialize_file_access.hpp" Atmosphere::Atmosphere(const std::string model, const std::string space_weather_file_name, const double gauss_standard_deviation_rate, const bool is_manual_param, const double manual_f107, const double manual_f107a, const double manual_ap, diff --git a/src/environment/local/atmosphere.hpp b/src/environment/local/atmosphere.hpp index 5e93cd719..8489891d8 100644 --- a/src/environment/local/atmosphere.hpp +++ b/src/environment/local/atmosphere.hpp @@ -11,9 +11,9 @@ #include "dynamics/orbit/orbit.hpp" #include "environment/global/simulation_time.hpp" #include "environment/local/local_celestial_information.hpp" -#include "library/external/nrlmsise00/wrapper_nrlmsise00.hpp" -#include "library/logger/loggable.hpp" -#include "library/math/vector.hpp" +#include "logger/loggable.hpp" +#include "math_physics/atmosphere/wrapper_nrlmsise00.hpp" +#include "math_physics/math/vector.hpp" /** * @class Atmosphere diff --git a/src/environment/local/geomagnetic_field.cpp b/src/environment/local/geomagnetic_field.cpp index e45e04c69..6c9390d78 100644 --- a/src/environment/local/geomagnetic_field.cpp +++ b/src/environment/local/geomagnetic_field.cpp @@ -5,11 +5,11 @@ #include "geomagnetic_field.hpp" -#include "library/external/igrf/igrf.h" -#include "library/initialize/initialize_file_access.hpp" -#include "library/randomization/global_randomization.hpp" -#include "library/randomization/normal_randomization.hpp" -#include "library/randomization/random_walk.hpp" +#include "math_physics/geomagnetic/igrf.h" +#include "math_physics/randomization/global_randomization.hpp" +#include "math_physics/randomization/normal_randomization.hpp" +#include "math_physics/randomization/random_walk.hpp" +#include "setting_file_reader/initialize_file_access.hpp" GeomagneticField::GeomagneticField(const std::string igrf_file_name, const double random_walk_srandard_deviation_nT, const double random_walk_limit_nT, const double white_noise_standard_deviation_nT) diff --git a/src/environment/local/geomagnetic_field.hpp b/src/environment/local/geomagnetic_field.hpp index 64adc5c27..8a4e6ba99 100644 --- a/src/environment/local/geomagnetic_field.hpp +++ b/src/environment/local/geomagnetic_field.hpp @@ -6,10 +6,10 @@ #ifndef S2E_ENVIRONMENT_LOCAL_GEOMAGNETIC_FIELD_HPP_ #define S2E_ENVIRONMENT_LOCAL_GEOMAGNETIC_FIELD_HPP_ -#include "library/geodesy/geodetic_position.hpp" -#include "library/logger/loggable.hpp" -#include "library/math/quaternion.hpp" -#include "library/math/vector.hpp" +#include "logger/loggable.hpp" +#include "math_physics/geodesy/geodetic_position.hpp" +#include "math_physics/math/quaternion.hpp" +#include "math_physics/math/vector.hpp" /** * @class GeomagneticField diff --git a/src/environment/local/local_celestial_information.cpp b/src/environment/local/local_celestial_information.cpp index dc4737853..b980a4263 100644 --- a/src/environment/local/local_celestial_information.cpp +++ b/src/environment/local/local_celestial_information.cpp @@ -12,7 +12,7 @@ #include #include -#include "library/logger/log_utility.hpp" +#include "logger/log_utility.hpp" LocalCelestialInformation::LocalCelestialInformation(const CelestialInformation* global_celestial_information) : global_celestial_information_(global_celestial_information) { diff --git a/src/environment/local/local_environment.cpp b/src/environment/local/local_environment.cpp index dba52989c..bf1cf7b5a 100644 --- a/src/environment/local/local_environment.cpp +++ b/src/environment/local/local_environment.cpp @@ -6,7 +6,7 @@ #include "dynamics/attitude/attitude.hpp" #include "dynamics/orbit/orbit.hpp" -#include "library/initialize/initialize_file_access.hpp" +#include "setting_file_reader/initialize_file_access.hpp" LocalEnvironment::LocalEnvironment(const SimulationConfiguration* simulation_configuration, const GlobalEnvironment* global_environment, const int spacecraft_id) { diff --git a/src/environment/local/solar_radiation_pressure_environment.cpp b/src/environment/local/solar_radiation_pressure_environment.cpp index 8f5859e1e..16d380a54 100644 --- a/src/environment/local/solar_radiation_pressure_environment.cpp +++ b/src/environment/local/solar_radiation_pressure_environment.cpp @@ -8,10 +8,10 @@ #include #include -#include "library/initialize/initialize_file_access.hpp" -#include "library/logger/log_utility.hpp" -#include "library/math/constants.hpp" -#include "library/math/vector.hpp" +#include "logger/log_utility.hpp" +#include "math_physics/math/constants.hpp" +#include "math_physics/math/vector.hpp" +#include "setting_file_reader/initialize_file_access.hpp" SolarRadiationPressureEnvironment::SolarRadiationPressureEnvironment(LocalCelestialInformation* local_celestial_information) : local_celestial_information_(local_celestial_information) { diff --git a/src/logger/CMakeLists.txt b/src/logger/CMakeLists.txt new file mode 100644 index 000000000..336e85042 --- /dev/null +++ b/src/logger/CMakeLists.txt @@ -0,0 +1,9 @@ +project(LOGGER) +cmake_minimum_required(VERSION 3.13) + +add_library(${PROJECT_NAME} STATIC + logger.cpp + initialize_log.cpp +) + +include(../../common.cmake) diff --git a/src/library/logger/initialize_log.cpp b/src/logger/initialize_log.cpp similarity index 93% rename from src/library/logger/initialize_log.cpp rename to src/logger/initialize_log.cpp index 74f8b377e..239cfe3d4 100644 --- a/src/library/logger/initialize_log.cpp +++ b/src/logger/initialize_log.cpp @@ -5,7 +5,7 @@ #include "initialize_log.hpp" -#include +#include "../setting_file_reader/initialize_file_access.hpp" Logger* InitLog(std::string file_name) { IniAccess ini_file(file_name); diff --git a/src/library/logger/initialize_log.hpp b/src/logger/initialize_log.hpp similarity index 94% rename from src/library/logger/initialize_log.hpp rename to src/logger/initialize_log.hpp index 2f683bb83..0d70fc1e8 100644 --- a/src/library/logger/initialize_log.hpp +++ b/src/logger/initialize_log.hpp @@ -6,7 +6,7 @@ #ifndef S2E_LIBRARY_LOGGER_INITIALIZE_LOG_HPP_ #define S2E_LIBRARY_LOGGER_INITIALIZE_LOG_HPP_ -#include +#include /** * @fn InitLog diff --git a/src/library/logger/log_utility.hpp b/src/logger/log_utility.hpp similarity index 98% rename from src/library/logger/log_utility.hpp rename to src/logger/log_utility.hpp index 6bc9fdd5c..c47e373cd 100644 --- a/src/library/logger/log_utility.hpp +++ b/src/logger/log_utility.hpp @@ -7,8 +7,8 @@ #define S2E_LIBRARY_LOGGER_LOG_UTILITY_HPP_ #include -#include -#include +#include +#include #include #include diff --git a/src/library/logger/loggable.hpp b/src/logger/loggable.hpp similarity index 100% rename from src/library/logger/loggable.hpp rename to src/logger/loggable.hpp diff --git a/src/library/logger/logger.cpp b/src/logger/logger.cpp similarity index 100% rename from src/library/logger/logger.cpp rename to src/logger/logger.cpp diff --git a/src/library/logger/logger.hpp b/src/logger/logger.hpp similarity index 100% rename from src/library/logger/logger.hpp rename to src/logger/logger.hpp diff --git a/src/library/CMakeLists.txt b/src/math_physics/CMakeLists.txt similarity index 66% rename from src/library/CMakeLists.txt rename to src/math_physics/CMakeLists.txt index 3499c09e9..7eb305f84 100644 --- a/src/library/CMakeLists.txt +++ b/src/math_physics/CMakeLists.txt @@ -1,24 +1,20 @@ -project(LIBRARY) +project(MATH_PHYSICS) cmake_minimum_required(VERSION 3.13) add_library(${PROJECT_NAME} STATIC atmosphere/simple_air_density_model.cpp atmosphere/harris_priester_model.cpp + atmosphere/wrapper_nrlmsise00.cpp geodesy/geodetic_position.cpp + geomagnetic/igrf.cpp + gnss/sp3_file_reader.cpp gnss/gnss_satellite_number.cpp gnss/antex_file_reader.cpp gnss/bias_sinex_file_reader.cpp - initialize/initialize_file_access.cpp - initialize/c2a_command_database.cpp - initialize/wings_operation_file.cpp - - logger/logger.cpp - logger/initialize_log.cpp - gravity/gravity_potential.cpp randomization/global_randomization.cpp @@ -37,25 +33,15 @@ add_library(${PROJECT_NAME} STATIC orbit/kepler_orbit.cpp orbit/relative_orbit_models.cpp orbit/interpolation_orbit.cpp + orbit/sgp4/sgp4ext.cpp + orbit/sgp4/sgp4io.cpp + orbit/sgp4/sgp4unit.cpp planet_rotation/moon_rotation_utilities.cpp time_system/date_time_format.cpp time_system/epoch_time.cpp time_system/gps_time.cpp - - external/igrf/igrf.cpp - external/inih/ini.c - external/inih/cpp/INIReader.cpp - external/nrlmsise00/wrapper_nrlmsise00.cpp - external/sgp4/sgp4ext.cpp - external/sgp4/sgp4io.cpp - external/sgp4/sgp4unit.cpp - - utilities/endian.cpp - utilities/slip.cpp - utilities/quantization.cpp - utilities/ring_buffer.cpp ) include(../../common.cmake) diff --git a/src/library/atmosphere/harris_priester_coefficients.hpp b/src/math_physics/atmosphere/harris_priester_coefficients.hpp similarity index 100% rename from src/library/atmosphere/harris_priester_coefficients.hpp rename to src/math_physics/atmosphere/harris_priester_coefficients.hpp diff --git a/src/library/atmosphere/harris_priester_model.cpp b/src/math_physics/atmosphere/harris_priester_model.cpp similarity index 98% rename from src/library/atmosphere/harris_priester_model.cpp rename to src/math_physics/atmosphere/harris_priester_model.cpp index 1ae3d375f..70ac6c5e4 100644 --- a/src/library/atmosphere/harris_priester_model.cpp +++ b/src/math_physics/atmosphere/harris_priester_model.cpp @@ -5,8 +5,8 @@ #include "harris_priester_model.hpp" #include -#include -#include +#include +#include #include "harris_priester_coefficients.hpp" diff --git a/src/library/atmosphere/harris_priester_model.hpp b/src/math_physics/atmosphere/harris_priester_model.hpp similarity index 92% rename from src/library/atmosphere/harris_priester_model.hpp rename to src/math_physics/atmosphere/harris_priester_model.hpp index 1e326f42c..77e9e7f46 100644 --- a/src/library/atmosphere/harris_priester_model.hpp +++ b/src/math_physics/atmosphere/harris_priester_model.hpp @@ -6,8 +6,8 @@ #ifndef S2E_LIBRARY_HARRIS_PRIESTER_MODEL_HPP_ #define S2E_LIBRARY_HARRIS_PRIESTER_MODEL_HPP_ -#include -#include +#include +#include namespace libra::atmosphere { diff --git a/src/library/atmosphere/simple_air_density_model.cpp b/src/math_physics/atmosphere/simple_air_density_model.cpp similarity index 100% rename from src/library/atmosphere/simple_air_density_model.cpp rename to src/math_physics/atmosphere/simple_air_density_model.cpp diff --git a/src/library/atmosphere/simple_air_density_model.hpp b/src/math_physics/atmosphere/simple_air_density_model.hpp similarity index 100% rename from src/library/atmosphere/simple_air_density_model.hpp rename to src/math_physics/atmosphere/simple_air_density_model.hpp diff --git a/src/library/external/nrlmsise00/wrapper_nrlmsise00.cpp b/src/math_physics/atmosphere/wrapper_nrlmsise00.cpp similarity index 99% rename from src/library/external/nrlmsise00/wrapper_nrlmsise00.cpp rename to src/math_physics/atmosphere/wrapper_nrlmsise00.cpp index b092af211..91a00c40f 100644 --- a/src/library/external/nrlmsise00/wrapper_nrlmsise00.cpp +++ b/src/math_physics/atmosphere/wrapper_nrlmsise00.cpp @@ -16,7 +16,7 @@ extern "C" { #include #include /* maths functions */ #include -#include +#include #include #include "wrapper_nrlmsise00.hpp" /* header for nrlmsise-00.h */ diff --git a/src/library/external/nrlmsise00/wrapper_nrlmsise00.hpp b/src/math_physics/atmosphere/wrapper_nrlmsise00.hpp similarity index 100% rename from src/library/external/nrlmsise00/wrapper_nrlmsise00.hpp rename to src/math_physics/atmosphere/wrapper_nrlmsise00.hpp diff --git a/src/library/control_utilities/first_order_lag.hpp b/src/math_physics/control_utilities/first_order_lag.hpp similarity index 100% rename from src/library/control_utilities/first_order_lag.hpp rename to src/math_physics/control_utilities/first_order_lag.hpp diff --git a/src/library/geodesy/geodetic_position.cpp b/src/math_physics/geodesy/geodetic_position.cpp similarity index 94% rename from src/library/geodesy/geodetic_position.cpp rename to src/math_physics/geodesy/geodetic_position.cpp index 1cb8c6abc..cd491b920 100644 --- a/src/library/geodesy/geodetic_position.cpp +++ b/src/math_physics/geodesy/geodetic_position.cpp @@ -4,11 +4,11 @@ */ #include "geodetic_position.hpp" -#include // TODO: do not to use the functions in SGP4 library +#include // TODO: do not to use the functions in SGP4 library #include -#include -#include +#include +#include GeodeticPosition::GeodeticPosition() { latitude_rad_ = 0.0; diff --git a/src/library/geodesy/geodetic_position.hpp b/src/math_physics/geodesy/geodetic_position.hpp similarity index 96% rename from src/library/geodesy/geodetic_position.hpp rename to src/math_physics/geodesy/geodetic_position.hpp index 2b6c68eec..8a60cfa68 100644 --- a/src/library/geodesy/geodetic_position.hpp +++ b/src/math_physics/geodesy/geodetic_position.hpp @@ -6,8 +6,8 @@ #ifndef S2E_LIBRARY_GEODESY_GEODETIC_POSITION_HPP_ #define S2E_LIBRARY_GEODESY_GEODETIC_POSITION_HPP_ -#include -#include +#include +#include /** * @class GeodeticPosition diff --git a/src/library/external/igrf/igrf.cpp b/src/math_physics/geomagnetic/igrf.cpp similarity index 96% rename from src/library/external/igrf/igrf.cpp rename to src/math_physics/geomagnetic/igrf.cpp index 92c0b25ce..cc89efc82 100644 --- a/src/library/external/igrf/igrf.cpp +++ b/src/math_physics/geomagnetic/igrf.cpp @@ -48,7 +48,7 @@ #include using namespace std; -#include "../sgp4/sgp4ext.h" +#include "../../math_physics/orbit/sgp4/sgp4ext.h" #include "igrf.h" double testglobal[3]; @@ -297,12 +297,12 @@ void gigrf(int gen, double year) { // char file[]="igrf10.coef"; // char path[] = "igrf11.coef"; // char file[] = "igrf11.coef"; - // char path[] = "src/library/external/igrf/igrf11.coef"; - // char file[] = "src/library/external/igrf/igrf11.coef"; - // char path[] = "../SatAttSim/src/library/external/igrf/igrf12.coef"; - // char file[] = "../SatAttSim/src/library/external/igrf/igrf12.coef"; - // char path[] = "../../SatAttSim/src/library/external/igrf/igrf13.coef"; //from 2020 - // char file[] = "../../SatAttSim/src/library/external/igrf/igrf13.coef"; //from 2020 + // char path[] = "src/external_libraries/igrf/igrf11.coef"; + // char file[] = "src/external_libraries/igrf/igrf11.coef"; + // char path[] = "../SatAttSim/src/external_libraries/igrf/igrf12.coef"; + // char file[] = "../SatAttSim/src/external_libraries/igrf/igrf12.coef"; + // char path[] = "../../SatAttSim/src/external_libraries/igrf/igrf13.coef"; //from 2020 + // char file[] = "../../SatAttSim/src/external_libraries/igrf/igrf13.coef"; //from 2020 char file[256]; diff --git a/src/library/external/igrf/igrf.h b/src/math_physics/geomagnetic/igrf.h similarity index 100% rename from src/library/external/igrf/igrf.h rename to src/math_physics/geomagnetic/igrf.h diff --git a/src/library/external/igrf/igrf11.coef b/src/math_physics/geomagnetic/igrf11.coef similarity index 100% rename from src/library/external/igrf/igrf11.coef rename to src/math_physics/geomagnetic/igrf11.coef diff --git a/src/library/external/igrf/igrf12.coef b/src/math_physics/geomagnetic/igrf12.coef similarity index 100% rename from src/library/external/igrf/igrf12.coef rename to src/math_physics/geomagnetic/igrf12.coef diff --git a/src/library/external/igrf/igrf13.coef b/src/math_physics/geomagnetic/igrf13.coef similarity index 100% rename from src/library/external/igrf/igrf13.coef rename to src/math_physics/geomagnetic/igrf13.coef diff --git a/src/library/gnss/antex_file_reader.cpp b/src/math_physics/gnss/antex_file_reader.cpp similarity index 99% rename from src/library/gnss/antex_file_reader.cpp rename to src/math_physics/gnss/antex_file_reader.cpp index 7b0e85e54..6baf196e1 100644 --- a/src/library/gnss/antex_file_reader.cpp +++ b/src/math_physics/gnss/antex_file_reader.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #define ANTEX_LINE_TYPE_POSITION (60) diff --git a/src/library/gnss/antex_file_reader.hpp b/src/math_physics/gnss/antex_file_reader.hpp similarity index 99% rename from src/library/gnss/antex_file_reader.hpp rename to src/math_physics/gnss/antex_file_reader.hpp index 7e7fc8073..953800d9f 100644 --- a/src/library/gnss/antex_file_reader.hpp +++ b/src/math_physics/gnss/antex_file_reader.hpp @@ -10,9 +10,9 @@ #include -#include -#include #include +#include +#include #include #include diff --git a/src/library/gnss/bias_sinex_file_reader.cpp b/src/math_physics/gnss/bias_sinex_file_reader.cpp similarity index 100% rename from src/library/gnss/bias_sinex_file_reader.cpp rename to src/math_physics/gnss/bias_sinex_file_reader.cpp diff --git a/src/library/gnss/bias_sinex_file_reader.hpp b/src/math_physics/gnss/bias_sinex_file_reader.hpp similarity index 100% rename from src/library/gnss/bias_sinex_file_reader.hpp rename to src/math_physics/gnss/bias_sinex_file_reader.hpp diff --git a/src/library/gnss/example.BSX b/src/math_physics/gnss/example.BSX similarity index 100% rename from src/library/gnss/example.BSX rename to src/math_physics/gnss/example.BSX diff --git a/src/library/gnss/example.atx b/src/math_physics/gnss/example.atx similarity index 100% rename from src/library/gnss/example.atx rename to src/math_physics/gnss/example.atx diff --git a/src/library/gnss/example.sp3 b/src/math_physics/gnss/example.sp3 similarity index 100% rename from src/library/gnss/example.sp3 rename to src/math_physics/gnss/example.sp3 diff --git a/src/library/gnss/gnss_satellite_number.cpp b/src/math_physics/gnss/gnss_satellite_number.cpp similarity index 100% rename from src/library/gnss/gnss_satellite_number.cpp rename to src/math_physics/gnss/gnss_satellite_number.cpp diff --git a/src/library/gnss/gnss_satellite_number.hpp b/src/math_physics/gnss/gnss_satellite_number.hpp similarity index 100% rename from src/library/gnss/gnss_satellite_number.hpp rename to src/math_physics/gnss/gnss_satellite_number.hpp diff --git a/src/library/gnss/igs_product_name_handling.hpp b/src/math_physics/gnss/igs_product_name_handling.hpp similarity index 100% rename from src/library/gnss/igs_product_name_handling.hpp rename to src/math_physics/gnss/igs_product_name_handling.hpp diff --git a/src/library/gnss/sp3_file_reader.cpp b/src/math_physics/gnss/sp3_file_reader.cpp similarity index 100% rename from src/library/gnss/sp3_file_reader.cpp rename to src/math_physics/gnss/sp3_file_reader.cpp diff --git a/src/library/gnss/sp3_file_reader.hpp b/src/math_physics/gnss/sp3_file_reader.hpp similarity index 98% rename from src/library/gnss/sp3_file_reader.hpp rename to src/math_physics/gnss/sp3_file_reader.hpp index 3d86cc28e..565382899 100644 --- a/src/library/gnss/sp3_file_reader.hpp +++ b/src/math_physics/gnss/sp3_file_reader.hpp @@ -10,10 +10,10 @@ #include -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/src/library/gnss/test_antex_file_reader.cpp b/src/math_physics/gnss/test_antex_file_reader.cpp similarity index 99% rename from src/library/gnss/test_antex_file_reader.cpp rename to src/math_physics/gnss/test_antex_file_reader.cpp index b696e1df7..d5d392f19 100644 --- a/src/library/gnss/test_antex_file_reader.cpp +++ b/src/math_physics/gnss/test_antex_file_reader.cpp @@ -11,7 +11,7 @@ * @brief Test Constructor */ TEST(AntexReader, Constructor) { - std::string test_file_name = "/src/library/gnss/example.atx"; + std::string test_file_name = "/src/math_physics/gnss/example.atx"; AntexFileReader antex_file_fault("false_file_path.atx"); EXPECT_FALSE(antex_file_fault.GetFileReadSuccessFlag()); diff --git a/src/library/gnss/test_bias_sinex_file_reader.cpp b/src/math_physics/gnss/test_bias_sinex_file_reader.cpp similarity index 94% rename from src/library/gnss/test_bias_sinex_file_reader.cpp rename to src/math_physics/gnss/test_bias_sinex_file_reader.cpp index ab806a070..99c52c8d7 100644 --- a/src/library/gnss/test_bias_sinex_file_reader.cpp +++ b/src/math_physics/gnss/test_bias_sinex_file_reader.cpp @@ -8,7 +8,7 @@ TEST(BiasSinex, Constructor) { EXPECT_FALSE(bias_sinex_file_fault.GetFileReadSuccessFlag()); // File read check - std::string test_file_name = "/src/library/gnss/example.BSX"; + std::string test_file_name = "/src/math_physics/gnss/example.BSX"; BiasSinexFileReader bias_sinex_file(CORE_DIR_FROM_EXE + test_file_name); EXPECT_TRUE(bias_sinex_file.GetFileReadSuccessFlag()); diff --git a/src/library/gnss/test_gnss_satellite_number.cpp b/src/math_physics/gnss/test_gnss_satellite_number.cpp similarity index 100% rename from src/library/gnss/test_gnss_satellite_number.cpp rename to src/math_physics/gnss/test_gnss_satellite_number.cpp diff --git a/src/library/gnss/test_igs_product_name_handling.cpp b/src/math_physics/gnss/test_igs_product_name_handling.cpp similarity index 100% rename from src/library/gnss/test_igs_product_name_handling.cpp rename to src/math_physics/gnss/test_igs_product_name_handling.cpp diff --git a/src/library/gnss/test_sp3_file_reader.cpp b/src/math_physics/gnss/test_sp3_file_reader.cpp similarity index 97% rename from src/library/gnss/test_sp3_file_reader.cpp rename to src/math_physics/gnss/test_sp3_file_reader.cpp index ef8e3e245..4a017894e 100644 --- a/src/library/gnss/test_sp3_file_reader.cpp +++ b/src/math_physics/gnss/test_sp3_file_reader.cpp @@ -10,7 +10,7 @@ * @brief Test Constructor */ TEST(Sp3FileReader, Constructor) { - std::string test_file_name = "/src/library/gnss/example.sp3"; + std::string test_file_name = "/src/math_physics/gnss/example.sp3"; Sp3FileReader sp3_file(CORE_DIR_FROM_EXE + test_file_name); // Test Header diff --git a/src/library/gravity/gravity_potential.cpp b/src/math_physics/gravity/gravity_potential.cpp similarity index 100% rename from src/library/gravity/gravity_potential.cpp rename to src/math_physics/gravity/gravity_potential.cpp diff --git a/src/library/gravity/gravity_potential.hpp b/src/math_physics/gravity/gravity_potential.hpp similarity index 100% rename from src/library/gravity/gravity_potential.hpp rename to src/math_physics/gravity/gravity_potential.hpp diff --git a/src/library/gravity/test_gravity_potential.cpp b/src/math_physics/gravity/test_gravity_potential.cpp similarity index 100% rename from src/library/gravity/test_gravity_potential.cpp rename to src/math_physics/gravity/test_gravity_potential.cpp diff --git a/src/library/math/constants.hpp b/src/math_physics/math/constants.hpp similarity index 100% rename from src/library/math/constants.hpp rename to src/math_physics/math/constants.hpp diff --git a/src/library/math/interpolation.cpp b/src/math_physics/math/interpolation.cpp similarity index 100% rename from src/library/math/interpolation.cpp rename to src/math_physics/math/interpolation.cpp diff --git a/src/library/math/interpolation.hpp b/src/math_physics/math/interpolation.hpp similarity index 100% rename from src/library/math/interpolation.hpp rename to src/math_physics/math/interpolation.hpp diff --git a/src/library/math/matrix.hpp b/src/math_physics/math/matrix.hpp similarity index 100% rename from src/library/math/matrix.hpp rename to src/math_physics/math/matrix.hpp diff --git a/src/library/math/matrix_template_functions.hpp b/src/math_physics/math/matrix_template_functions.hpp similarity index 100% rename from src/library/math/matrix_template_functions.hpp rename to src/math_physics/math/matrix_template_functions.hpp diff --git a/src/library/math/matrix_vector.hpp b/src/math_physics/math/matrix_vector.hpp similarity index 100% rename from src/library/math/matrix_vector.hpp rename to src/math_physics/math/matrix_vector.hpp diff --git a/src/library/math/matrix_vector_template_functions.hpp b/src/math_physics/math/matrix_vector_template_functions.hpp similarity index 100% rename from src/library/math/matrix_vector_template_functions.hpp rename to src/math_physics/math/matrix_vector_template_functions.hpp diff --git a/src/library/math/ordinary_differential_equation.hpp b/src/math_physics/math/ordinary_differential_equation.hpp similarity index 100% rename from src/library/math/ordinary_differential_equation.hpp rename to src/math_physics/math/ordinary_differential_equation.hpp diff --git a/src/library/math/ordinary_differential_equation_template_functions.hpp b/src/math_physics/math/ordinary_differential_equation_template_functions.hpp similarity index 100% rename from src/library/math/ordinary_differential_equation_template_functions.hpp rename to src/math_physics/math/ordinary_differential_equation_template_functions.hpp diff --git a/src/library/math/quaternion.cpp b/src/math_physics/math/quaternion.cpp similarity index 100% rename from src/library/math/quaternion.cpp rename to src/math_physics/math/quaternion.cpp diff --git a/src/library/math/quaternion.hpp b/src/math_physics/math/quaternion.hpp similarity index 100% rename from src/library/math/quaternion.hpp rename to src/math_physics/math/quaternion.hpp diff --git a/src/library/math/s2e_math.cpp b/src/math_physics/math/s2e_math.cpp similarity index 91% rename from src/library/math/s2e_math.cpp rename to src/math_physics/math/s2e_math.cpp index 4ed37a10e..7ae8f5777 100644 --- a/src/library/math/s2e_math.cpp +++ b/src/math_physics/math/s2e_math.cpp @@ -5,7 +5,7 @@ #include "s2e_math.hpp" -#include +#include namespace libra { double WrapTo2Pi(const double angle_rad) { diff --git a/src/library/math/s2e_math.hpp b/src/math_physics/math/s2e_math.hpp similarity index 100% rename from src/library/math/s2e_math.hpp rename to src/math_physics/math/s2e_math.hpp diff --git a/src/library/math/test_interpolation.cpp b/src/math_physics/math/test_interpolation.cpp similarity index 100% rename from src/library/math/test_interpolation.cpp rename to src/math_physics/math/test_interpolation.cpp diff --git a/src/library/math/test_matrix.cpp b/src/math_physics/math/test_matrix.cpp similarity index 100% rename from src/library/math/test_matrix.cpp rename to src/math_physics/math/test_matrix.cpp diff --git a/src/library/math/test_matrix_vector.cpp b/src/math_physics/math/test_matrix_vector.cpp similarity index 100% rename from src/library/math/test_matrix_vector.cpp rename to src/math_physics/math/test_matrix_vector.cpp diff --git a/src/library/math/test_quaternion.cpp b/src/math_physics/math/test_quaternion.cpp similarity index 100% rename from src/library/math/test_quaternion.cpp rename to src/math_physics/math/test_quaternion.cpp diff --git a/src/library/math/test_s2e_math.cpp b/src/math_physics/math/test_s2e_math.cpp similarity index 100% rename from src/library/math/test_s2e_math.cpp rename to src/math_physics/math/test_s2e_math.cpp diff --git a/src/library/math/test_vector.cpp b/src/math_physics/math/test_vector.cpp similarity index 100% rename from src/library/math/test_vector.cpp rename to src/math_physics/math/test_vector.cpp diff --git a/src/library/math/vector.cpp b/src/math_physics/math/vector.cpp similarity index 100% rename from src/library/math/vector.cpp rename to src/math_physics/math/vector.cpp diff --git a/src/library/math/vector.hpp b/src/math_physics/math/vector.hpp similarity index 100% rename from src/library/math/vector.hpp rename to src/math_physics/math/vector.hpp diff --git a/src/library/math/vector_template_functions.hpp b/src/math_physics/math/vector_template_functions.hpp similarity index 100% rename from src/library/math/vector_template_functions.hpp rename to src/math_physics/math/vector_template_functions.hpp diff --git a/src/library/numerical_integration/dormand_prince_5.hpp b/src/math_physics/numerical_integration/dormand_prince_5.hpp similarity index 100% rename from src/library/numerical_integration/dormand_prince_5.hpp rename to src/math_physics/numerical_integration/dormand_prince_5.hpp diff --git a/src/library/numerical_integration/dormand_prince_5_implementation.hpp b/src/math_physics/numerical_integration/dormand_prince_5_implementation.hpp similarity index 100% rename from src/library/numerical_integration/dormand_prince_5_implementation.hpp rename to src/math_physics/numerical_integration/dormand_prince_5_implementation.hpp diff --git a/src/library/numerical_integration/embedded_runge_kutta.hpp b/src/math_physics/numerical_integration/embedded_runge_kutta.hpp similarity index 100% rename from src/library/numerical_integration/embedded_runge_kutta.hpp rename to src/math_physics/numerical_integration/embedded_runge_kutta.hpp diff --git a/src/library/numerical_integration/embedded_runge_kutta_implementation.hpp b/src/math_physics/numerical_integration/embedded_runge_kutta_implementation.hpp similarity index 100% rename from src/library/numerical_integration/embedded_runge_kutta_implementation.hpp rename to src/math_physics/numerical_integration/embedded_runge_kutta_implementation.hpp diff --git a/src/library/numerical_integration/interface_ode.hpp b/src/math_physics/numerical_integration/interface_ode.hpp similarity index 100% rename from src/library/numerical_integration/interface_ode.hpp rename to src/math_physics/numerical_integration/interface_ode.hpp diff --git a/src/library/numerical_integration/numerical_integrator.hpp b/src/math_physics/numerical_integration/numerical_integrator.hpp similarity index 100% rename from src/library/numerical_integration/numerical_integrator.hpp rename to src/math_physics/numerical_integration/numerical_integrator.hpp diff --git a/src/library/numerical_integration/numerical_integrator_manager.hpp b/src/math_physics/numerical_integration/numerical_integrator_manager.hpp similarity index 100% rename from src/library/numerical_integration/numerical_integrator_manager.hpp rename to src/math_physics/numerical_integration/numerical_integrator_manager.hpp diff --git a/src/library/numerical_integration/ode_examples.hpp b/src/math_physics/numerical_integration/ode_examples.hpp similarity index 98% rename from src/library/numerical_integration/ode_examples.hpp rename to src/math_physics/numerical_integration/ode_examples.hpp index fb0fbfdeb..401771d82 100644 --- a/src/library/numerical_integration/ode_examples.hpp +++ b/src/math_physics/numerical_integration/ode_examples.hpp @@ -6,7 +6,7 @@ #ifndef S2E_LIBRARY_NUMERICAL_INTEGRATION_EXAMPLE_ODE_HPP_ #define S2E_LIBRARY_NUMERICAL_INTEGRATION_EXAMPLE_ODE_HPP_ -#include "../utilities/macros.hpp" +#include "../../utilities/macros.hpp" #include "interface_ode.hpp" namespace libra::numerical_integration { diff --git a/src/library/numerical_integration/runge_kutta.hpp b/src/math_physics/numerical_integration/runge_kutta.hpp similarity index 100% rename from src/library/numerical_integration/runge_kutta.hpp rename to src/math_physics/numerical_integration/runge_kutta.hpp diff --git a/src/library/numerical_integration/runge_kutta_4.hpp b/src/math_physics/numerical_integration/runge_kutta_4.hpp similarity index 97% rename from src/library/numerical_integration/runge_kutta_4.hpp rename to src/math_physics/numerical_integration/runge_kutta_4.hpp index 0ac8402af..50942186d 100644 --- a/src/library/numerical_integration/runge_kutta_4.hpp +++ b/src/math_physics/numerical_integration/runge_kutta_4.hpp @@ -6,7 +6,7 @@ #ifndef S2E_LIBRARY_NUMERICAL_INTEGRATION_RUNGE_KUTTA_4_HPP_ #define S2E_LIBRARY_NUMERICAL_INTEGRATION_RUNGE_KUTTA_4_HPP_ -#include +#include #include "runge_kutta.hpp" diff --git a/src/library/numerical_integration/runge_kutta_fehlberg.hpp b/src/math_physics/numerical_integration/runge_kutta_fehlberg.hpp similarity index 100% rename from src/library/numerical_integration/runge_kutta_fehlberg.hpp rename to src/math_physics/numerical_integration/runge_kutta_fehlberg.hpp diff --git a/src/library/numerical_integration/runge_kutta_fehlberg_implementation.hpp b/src/math_physics/numerical_integration/runge_kutta_fehlberg_implementation.hpp similarity index 100% rename from src/library/numerical_integration/runge_kutta_fehlberg_implementation.hpp rename to src/math_physics/numerical_integration/runge_kutta_fehlberg_implementation.hpp diff --git a/src/library/numerical_integration/runge_kutta_template.hpp b/src/math_physics/numerical_integration/runge_kutta_template.hpp similarity index 100% rename from src/library/numerical_integration/runge_kutta_template.hpp rename to src/math_physics/numerical_integration/runge_kutta_template.hpp diff --git a/src/library/numerical_integration/test_runge_kutta.cpp b/src/math_physics/numerical_integration/test_runge_kutta.cpp similarity index 100% rename from src/library/numerical_integration/test_runge_kutta.cpp rename to src/math_physics/numerical_integration/test_runge_kutta.cpp diff --git a/src/library/optics/gaussian_beam_base.cpp b/src/math_physics/optics/gaussian_beam_base.cpp similarity index 97% rename from src/library/optics/gaussian_beam_base.cpp rename to src/math_physics/optics/gaussian_beam_base.cpp index 3f181c0b0..f47842dad 100644 --- a/src/library/optics/gaussian_beam_base.cpp +++ b/src/math_physics/optics/gaussian_beam_base.cpp @@ -6,7 +6,7 @@ #include "gaussian_beam_base.hpp" #include -#include +#include GaussianBeamBase::GaussianBeamBase(double wavelength_m, double radius_beam_waist_m, double total_power_W) : wavelength_m_(wavelength_m), radius_beam_waist_m_(radius_beam_waist_m), total_power_W_(total_power_W) {} diff --git a/src/library/optics/gaussian_beam_base.hpp b/src/math_physics/optics/gaussian_beam_base.hpp similarity index 100% rename from src/library/optics/gaussian_beam_base.hpp rename to src/math_physics/optics/gaussian_beam_base.hpp diff --git a/src/library/orbit/interpolation_orbit.cpp b/src/math_physics/orbit/interpolation_orbit.cpp similarity index 100% rename from src/library/orbit/interpolation_orbit.cpp rename to src/math_physics/orbit/interpolation_orbit.cpp diff --git a/src/library/orbit/interpolation_orbit.hpp b/src/math_physics/orbit/interpolation_orbit.hpp similarity index 96% rename from src/library/orbit/interpolation_orbit.hpp rename to src/math_physics/orbit/interpolation_orbit.hpp index 8a4d628e8..2f8c4cfd1 100644 --- a/src/library/orbit/interpolation_orbit.hpp +++ b/src/math_physics/orbit/interpolation_orbit.hpp @@ -6,8 +6,8 @@ #ifndef S2E_LIBRARY_ORBIT_INTERPOLATION_ORBIT_HPP_ #define S2E_LIBRARY_ORBIT_INTERPOLATION_ORBIT_HPP_ -#include -#include +#include +#include #include /** diff --git a/src/library/orbit/kepler_orbit.cpp b/src/math_physics/orbit/kepler_orbit.cpp similarity index 100% rename from src/library/orbit/kepler_orbit.cpp rename to src/math_physics/orbit/kepler_orbit.cpp diff --git a/src/library/orbit/kepler_orbit.hpp b/src/math_physics/orbit/kepler_orbit.hpp similarity index 100% rename from src/library/orbit/kepler_orbit.hpp rename to src/math_physics/orbit/kepler_orbit.hpp diff --git a/src/library/orbit/orbital_elements.cpp b/src/math_physics/orbit/orbital_elements.cpp similarity index 100% rename from src/library/orbit/orbital_elements.cpp rename to src/math_physics/orbit/orbital_elements.cpp diff --git a/src/library/orbit/orbital_elements.hpp b/src/math_physics/orbit/orbital_elements.hpp similarity index 100% rename from src/library/orbit/orbital_elements.hpp rename to src/math_physics/orbit/orbital_elements.hpp diff --git a/src/library/orbit/relative_orbit_models.cpp b/src/math_physics/orbit/relative_orbit_models.cpp similarity index 100% rename from src/library/orbit/relative_orbit_models.cpp rename to src/math_physics/orbit/relative_orbit_models.cpp diff --git a/src/library/orbit/relative_orbit_models.hpp b/src/math_physics/orbit/relative_orbit_models.hpp similarity index 100% rename from src/library/orbit/relative_orbit_models.hpp rename to src/math_physics/orbit/relative_orbit_models.hpp diff --git a/src/library/external/sgp4/sgp4ext.cpp b/src/math_physics/orbit/sgp4/sgp4ext.cpp similarity index 100% rename from src/library/external/sgp4/sgp4ext.cpp rename to src/math_physics/orbit/sgp4/sgp4ext.cpp diff --git a/src/library/external/sgp4/sgp4ext.h b/src/math_physics/orbit/sgp4/sgp4ext.h similarity index 100% rename from src/library/external/sgp4/sgp4ext.h rename to src/math_physics/orbit/sgp4/sgp4ext.h diff --git a/src/library/external/sgp4/sgp4io.cpp b/src/math_physics/orbit/sgp4/sgp4io.cpp similarity index 100% rename from src/library/external/sgp4/sgp4io.cpp rename to src/math_physics/orbit/sgp4/sgp4io.cpp diff --git a/src/library/external/sgp4/sgp4io.h b/src/math_physics/orbit/sgp4/sgp4io.h similarity index 100% rename from src/library/external/sgp4/sgp4io.h rename to src/math_physics/orbit/sgp4/sgp4io.h diff --git a/src/library/external/sgp4/sgp4unit.cpp b/src/math_physics/orbit/sgp4/sgp4unit.cpp similarity index 99% rename from src/library/external/sgp4/sgp4unit.cpp rename to src/math_physics/orbit/sgp4/sgp4unit.cpp index 750a711ba..55e8f25c9 100644 --- a/src/library/external/sgp4/sgp4unit.cpp +++ b/src/math_physics/orbit/sgp4/sgp4unit.cpp @@ -37,7 +37,7 @@ #include "sgp4unit.h" #include -#include +#include // const char help = 'n'; // Remove to avoid unused warinings FILE* dbgfile; diff --git a/src/library/external/sgp4/sgp4unit.h b/src/math_physics/orbit/sgp4/sgp4unit.h similarity index 100% rename from src/library/external/sgp4/sgp4unit.h rename to src/math_physics/orbit/sgp4/sgp4unit.h diff --git a/src/library/orbit/test_interpolation_orbit.cpp b/src/math_physics/orbit/test_interpolation_orbit.cpp similarity index 100% rename from src/library/orbit/test_interpolation_orbit.cpp rename to src/math_physics/orbit/test_interpolation_orbit.cpp diff --git a/src/library/planet_rotation/moon_rotation_utilities.cpp b/src/math_physics/planet_rotation/moon_rotation_utilities.cpp similarity index 97% rename from src/library/planet_rotation/moon_rotation_utilities.cpp rename to src/math_physics/planet_rotation/moon_rotation_utilities.cpp index fc03ab9f0..e31574783 100644 --- a/src/library/planet_rotation/moon_rotation_utilities.cpp +++ b/src/math_physics/planet_rotation/moon_rotation_utilities.cpp @@ -8,7 +8,7 @@ #include "moon_rotation_utilities.hpp" -#include +#include libra::Matrix<3, 3> CalcDcmEciToPrincipalAxis(const libra::Vector<3> moon_position_eci_m, const libra::Vector<3> moon_velocity_eci_m_s) { libra::Matrix<3, 3> dcm_eci2me = CalcDcmEciToMeanEarth(moon_position_eci_m, moon_velocity_eci_m_s); diff --git a/src/library/planet_rotation/moon_rotation_utilities.hpp b/src/math_physics/planet_rotation/moon_rotation_utilities.hpp similarity index 95% rename from src/library/planet_rotation/moon_rotation_utilities.hpp rename to src/math_physics/planet_rotation/moon_rotation_utilities.hpp index 08e208704..314bbdaeb 100644 --- a/src/library/planet_rotation/moon_rotation_utilities.hpp +++ b/src/math_physics/planet_rotation/moon_rotation_utilities.hpp @@ -9,8 +9,8 @@ #ifndef S2E_LIBRARY_PLANET_ROTATION_MOON_MEAN_EARTH_PRINCIPAL_AXIS_FRAME_HPP_ #define S2E_LIBRARY_PLANET_ROTATION_MOON_MEAN_EARTH_PRINCIPAL_AXIS_FRAME_HPP_ -#include "library/math/matrix.hpp" -#include "library/math/vector.hpp" +#include "math_physics/math/matrix.hpp" +#include "math_physics/math/vector.hpp" /** * @fn CalcDcmEciToPrincipalAxis diff --git a/src/library/randomization/global_randomization.cpp b/src/math_physics/randomization/global_randomization.cpp similarity index 100% rename from src/library/randomization/global_randomization.cpp rename to src/math_physics/randomization/global_randomization.cpp diff --git a/src/library/randomization/global_randomization.hpp b/src/math_physics/randomization/global_randomization.hpp similarity index 100% rename from src/library/randomization/global_randomization.hpp rename to src/math_physics/randomization/global_randomization.hpp diff --git a/src/library/randomization/minimal_standard_linear_congruential_generator.cpp b/src/math_physics/randomization/minimal_standard_linear_congruential_generator.cpp similarity index 100% rename from src/library/randomization/minimal_standard_linear_congruential_generator.cpp rename to src/math_physics/randomization/minimal_standard_linear_congruential_generator.cpp diff --git a/src/library/randomization/minimal_standard_linear_congruential_generator.hpp b/src/math_physics/randomization/minimal_standard_linear_congruential_generator.hpp similarity index 100% rename from src/library/randomization/minimal_standard_linear_congruential_generator.hpp rename to src/math_physics/randomization/minimal_standard_linear_congruential_generator.hpp diff --git a/src/library/randomization/minimal_standard_linear_congruential_generator_with_shuffle.cpp b/src/math_physics/randomization/minimal_standard_linear_congruential_generator_with_shuffle.cpp similarity index 100% rename from src/library/randomization/minimal_standard_linear_congruential_generator_with_shuffle.cpp rename to src/math_physics/randomization/minimal_standard_linear_congruential_generator_with_shuffle.cpp diff --git a/src/library/randomization/minimal_standard_linear_congruential_generator_with_shuffle.hpp b/src/math_physics/randomization/minimal_standard_linear_congruential_generator_with_shuffle.hpp similarity index 100% rename from src/library/randomization/minimal_standard_linear_congruential_generator_with_shuffle.hpp rename to src/math_physics/randomization/minimal_standard_linear_congruential_generator_with_shuffle.hpp diff --git a/src/library/randomization/normal_randomization.cpp b/src/math_physics/randomization/normal_randomization.cpp similarity index 100% rename from src/library/randomization/normal_randomization.cpp rename to src/math_physics/randomization/normal_randomization.cpp diff --git a/src/library/randomization/normal_randomization.hpp b/src/math_physics/randomization/normal_randomization.hpp similarity index 100% rename from src/library/randomization/normal_randomization.hpp rename to src/math_physics/randomization/normal_randomization.hpp diff --git a/src/library/randomization/random_walk.hpp b/src/math_physics/randomization/random_walk.hpp similarity index 100% rename from src/library/randomization/random_walk.hpp rename to src/math_physics/randomization/random_walk.hpp diff --git a/src/library/randomization/random_walk_template_functions.hpp b/src/math_physics/randomization/random_walk_template_functions.hpp similarity index 92% rename from src/library/randomization/random_walk_template_functions.hpp rename to src/math_physics/randomization/random_walk_template_functions.hpp index 3221d7228..4242f6952 100644 --- a/src/library/randomization/random_walk_template_functions.hpp +++ b/src/math_physics/randomization/random_walk_template_functions.hpp @@ -6,8 +6,8 @@ #ifndef S2E_LIBRARY_RANDOMIZATION_RANDOM_WALK_TEMPLATE_FUNCTIONS_HPP_ #define S2E_LIBRARY_RANDOMIZATION_RANDOM_WALK_TEMPLATE_FUNCTIONS_HPP_ -#include -#include +#include +#include template RandomWalk::RandomWalk(double step_width_s, const libra::Vector& standard_deviation, const libra::Vector& limit) diff --git a/src/library/time_system/date_time_format.cpp b/src/math_physics/time_system/date_time_format.cpp similarity index 100% rename from src/library/time_system/date_time_format.cpp rename to src/math_physics/time_system/date_time_format.cpp diff --git a/src/library/time_system/date_time_format.hpp b/src/math_physics/time_system/date_time_format.hpp similarity index 100% rename from src/library/time_system/date_time_format.hpp rename to src/math_physics/time_system/date_time_format.hpp diff --git a/src/library/time_system/epoch_time.cpp b/src/math_physics/time_system/epoch_time.cpp similarity index 100% rename from src/library/time_system/epoch_time.cpp rename to src/math_physics/time_system/epoch_time.cpp diff --git a/src/library/time_system/epoch_time.hpp b/src/math_physics/time_system/epoch_time.hpp similarity index 100% rename from src/library/time_system/epoch_time.hpp rename to src/math_physics/time_system/epoch_time.hpp diff --git a/src/library/time_system/gps_time.cpp b/src/math_physics/time_system/gps_time.cpp similarity index 100% rename from src/library/time_system/gps_time.cpp rename to src/math_physics/time_system/gps_time.cpp diff --git a/src/library/time_system/gps_time.hpp b/src/math_physics/time_system/gps_time.hpp similarity index 100% rename from src/library/time_system/gps_time.hpp rename to src/math_physics/time_system/gps_time.hpp diff --git a/src/library/time_system/test_date_time_format.cpp b/src/math_physics/time_system/test_date_time_format.cpp similarity index 100% rename from src/library/time_system/test_date_time_format.cpp rename to src/math_physics/time_system/test_date_time_format.cpp diff --git a/src/library/time_system/test_epoch_time.cpp b/src/math_physics/time_system/test_epoch_time.cpp similarity index 100% rename from src/library/time_system/test_epoch_time.cpp rename to src/math_physics/time_system/test_epoch_time.cpp diff --git a/src/library/time_system/test_gps_time.cpp b/src/math_physics/time_system/test_gps_time.cpp similarity index 100% rename from src/library/time_system/test_gps_time.cpp rename to src/math_physics/time_system/test_gps_time.cpp diff --git a/src/s2e.cpp b/src/s2e.cpp index ed446ee20..cf0bee4f4 100644 --- a/src/s2e.cpp +++ b/src/s2e.cpp @@ -15,7 +15,7 @@ #include // Simulator includes -#include "library/logger/logger.hpp" +#include "logger/logger.hpp" // Add custom include files #include "simulation_sample/case/sample_case.hpp" diff --git a/src/setting_file_reader/CMakeLists.txt b/src/setting_file_reader/CMakeLists.txt new file mode 100644 index 000000000..898d3e0fa --- /dev/null +++ b/src/setting_file_reader/CMakeLists.txt @@ -0,0 +1,10 @@ +project(SETTING_FILE_READER) +cmake_minimum_required(VERSION 3.13) + +add_library(${PROJECT_NAME} STATIC + initialize_file_access.cpp + c2a_command_database.cpp + wings_operation_file.cpp +) + +include(../../common.cmake) diff --git a/src/library/initialize/c2a_command_database.cpp b/src/setting_file_reader/c2a_command_database.cpp similarity index 98% rename from src/library/initialize/c2a_command_database.cpp rename to src/setting_file_reader/c2a_command_database.cpp index b31655166..650c11cf5 100644 --- a/src/library/initialize/c2a_command_database.cpp +++ b/src/setting_file_reader/c2a_command_database.cpp @@ -7,9 +7,9 @@ #include #include -#include -#include #include +#include +#include C2aCommandInformation::C2aCommandInformation(const std::string cmd_db_line) { if (cmd_db_line.find("*") == 0) return; diff --git a/src/library/initialize/c2a_command_database.hpp b/src/setting_file_reader/c2a_command_database.hpp similarity index 100% rename from src/library/initialize/c2a_command_database.hpp rename to src/setting_file_reader/c2a_command_database.hpp diff --git a/src/library/initialize/initialize_file_access.cpp b/src/setting_file_reader/initialize_file_access.cpp similarity index 100% rename from src/library/initialize/initialize_file_access.cpp rename to src/setting_file_reader/initialize_file_access.cpp diff --git a/src/library/initialize/initialize_file_access.hpp b/src/setting_file_reader/initialize_file_access.hpp similarity index 98% rename from src/library/initialize/initialize_file_access.hpp rename to src/setting_file_reader/initialize_file_access.hpp index 3d537b2ee..81b547214 100644 --- a/src/library/initialize/initialize_file_access.hpp +++ b/src/setting_file_reader/initialize_file_access.hpp @@ -17,12 +17,12 @@ #define NOMINMAX #include #else -#include +#include "../../ExtLibraries/inih/cpp/INIReader.h" #endif #include -#include -#include +#include +#include #include #include #include diff --git a/src/library/initialize/wings_operation_file.cpp b/src/setting_file_reader/wings_operation_file.cpp similarity index 100% rename from src/library/initialize/wings_operation_file.cpp rename to src/setting_file_reader/wings_operation_file.cpp diff --git a/src/library/initialize/wings_operation_file.hpp b/src/setting_file_reader/wings_operation_file.hpp similarity index 100% rename from src/library/initialize/wings_operation_file.hpp rename to src/setting_file_reader/wings_operation_file.hpp diff --git a/src/simulation/case/simulation_case.cpp b/src/simulation/case/simulation_case.cpp index 334514a94..1a19dd003 100644 --- a/src/simulation/case/simulation_case.cpp +++ b/src/simulation/case/simulation_case.cpp @@ -5,8 +5,8 @@ #include "simulation_case.hpp" -#include -#include +#include +#include #include SimulationCase::SimulationCase(const std::string initialize_base_file) { diff --git a/src/simulation/case/simulation_case.hpp b/src/simulation/case/simulation_case.hpp index b6aeba357..68f73f66c 100644 --- a/src/simulation/case/simulation_case.hpp +++ b/src/simulation/case/simulation_case.hpp @@ -7,7 +7,7 @@ #define S2E_SIMULATION_CASE_SIMULATION_CASE_HPP_ #include -#include +#include #include #include "../simulation_configuration.hpp" diff --git a/src/simulation/ground_station/ground_station.cpp b/src/simulation/ground_station/ground_station.cpp index cac7332f2..32805e502 100644 --- a/src/simulation/ground_station/ground_station.cpp +++ b/src/simulation/ground_station/ground_station.cpp @@ -6,12 +6,12 @@ #include "ground_station.hpp" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include +#include GroundStation::GroundStation(const SimulationConfiguration* configuration, const unsigned int ground_station_id) : ground_station_id_(ground_station_id) { diff --git a/src/simulation/ground_station/ground_station.hpp b/src/simulation/ground_station/ground_station.hpp index d6a505d03..f7caeb019 100644 --- a/src/simulation/ground_station/ground_station.hpp +++ b/src/simulation/ground_station/ground_station.hpp @@ -6,8 +6,8 @@ #ifndef S2E_SIMULATION_GROUND_STATION_GROUND_STATION_HPP_ #define S2E_SIMULATION_GROUND_STATION_GROUND_STATION_HPP_ -#include -#include +#include +#include #include #include "../simulation_configuration.hpp" diff --git a/src/simulation/hils/hils_port_manager.cpp b/src/simulation/hils/hils_port_manager.cpp index b794334be..40e4d36fe 100644 --- a/src/simulation/hils/hils_port_manager.cpp +++ b/src/simulation/hils/hils_port_manager.cpp @@ -5,7 +5,7 @@ #include "hils_port_manager.hpp" -#include +#include // #define HILS_PORT_MANAGER_SHOW_DEBUG_DATA diff --git a/src/simulation/monte_carlo_simulation/initialize_monte_carlo_parameters.cpp b/src/simulation/monte_carlo_simulation/initialize_monte_carlo_parameters.cpp index fe8716e1e..25bc20100 100644 --- a/src/simulation/monte_carlo_simulation/initialize_monte_carlo_parameters.cpp +++ b/src/simulation/monte_carlo_simulation/initialize_monte_carlo_parameters.cpp @@ -5,7 +5,7 @@ #include "initialize_monte_carlo_parameters.hpp" -#include +#include using namespace std; diff --git a/src/simulation/monte_carlo_simulation/initialize_monte_carlo_parameters.hpp b/src/simulation/monte_carlo_simulation/initialize_monte_carlo_parameters.hpp index 193a5f6a2..cf73abc2a 100644 --- a/src/simulation/monte_carlo_simulation/initialize_monte_carlo_parameters.hpp +++ b/src/simulation/monte_carlo_simulation/initialize_monte_carlo_parameters.hpp @@ -7,8 +7,8 @@ #define S2E_SIMULATION_MONTE_CARLO_SIMULATION_INITIALIZE_MONTE_CARLO_PARAMETERS_HPP_ #include -#include -#include +#include +#include #include #include #include diff --git a/src/simulation/monte_carlo_simulation/initialize_monte_carlo_simulation.cpp b/src/simulation/monte_carlo_simulation/initialize_monte_carlo_simulation.cpp index dbe10646b..267859b9a 100644 --- a/src/simulation/monte_carlo_simulation/initialize_monte_carlo_simulation.cpp +++ b/src/simulation/monte_carlo_simulation/initialize_monte_carlo_simulation.cpp @@ -6,7 +6,7 @@ #include "initialize_monte_carlo_simulation.hpp" #include -#include +#include #define MAX_CHAR_NUM 256 diff --git a/src/simulation/monte_carlo_simulation/monte_carlo_simulation_executor.hpp b/src/simulation/monte_carlo_simulation/monte_carlo_simulation_executor.hpp index 83dfcf618..57440e33d 100644 --- a/src/simulation/monte_carlo_simulation/monte_carlo_simulation_executor.hpp +++ b/src/simulation/monte_carlo_simulation/monte_carlo_simulation_executor.hpp @@ -6,8 +6,8 @@ #ifndef S2E_SIMULATION_MONTE_CARLO_SIMULATION_MONTE_CARLO_SIMULATION_EXECUTOR_HPP_ #define S2E_SIMULATION_MONTE_CARLO_SIMULATION_MONTE_CARLO_SIMULATION_EXECUTOR_HPP_ -#include #include +#include #include // #include "simulation_object.hpp" #include "initialize_monte_carlo_parameters.hpp" diff --git a/src/simulation/monte_carlo_simulation/simulation_object.hpp b/src/simulation/monte_carlo_simulation/simulation_object.hpp index 9d46d482d..daf6d23ee 100644 --- a/src/simulation/monte_carlo_simulation/simulation_object.hpp +++ b/src/simulation/monte_carlo_simulation/simulation_object.hpp @@ -7,9 +7,9 @@ #define S2E_SIMULATION_MONTE_CARLO_SIMULATION_SIMULATION_OBJECT_HPP_ #include -#include -#include #include +#include +#include #include #include diff --git a/src/simulation/multiple_spacecraft/inter_spacecraft_communication.cpp b/src/simulation/multiple_spacecraft/inter_spacecraft_communication.cpp index 6e4678aee..0324d2e2e 100644 --- a/src/simulation/multiple_spacecraft/inter_spacecraft_communication.cpp +++ b/src/simulation/multiple_spacecraft/inter_spacecraft_communication.cpp @@ -5,7 +5,7 @@ #include "inter_spacecraft_communication.hpp" -#include +#include InterSpacecraftCommunication::InterSpacecraftCommunication(const SimulationConfiguration* simulation_configuration) { UNUSED(simulation_configuration); diff --git a/src/simulation/multiple_spacecraft/relative_information.hpp b/src/simulation/multiple_spacecraft/relative_information.hpp index 428f426f9..a1de06e28 100644 --- a/src/simulation/multiple_spacecraft/relative_information.hpp +++ b/src/simulation/multiple_spacecraft/relative_information.hpp @@ -9,8 +9,8 @@ #include #include "../../dynamics/dynamics.hpp" -#include "../../library/logger/loggable.hpp" -#include "../../library/logger/logger.hpp" +#include "../../logger/loggable.hpp" +#include "../../logger/logger.hpp" /** * @class RelativeInformation diff --git a/src/simulation/simulation_configuration.hpp b/src/simulation/simulation_configuration.hpp index 25bde1245..28b6f74f0 100644 --- a/src/simulation/simulation_configuration.hpp +++ b/src/simulation/simulation_configuration.hpp @@ -9,7 +9,7 @@ #include #include -#include "../library/logger/logger.hpp" +#include "../logger/logger.hpp" /** * @struct SimulationConfiguration diff --git a/src/simulation/spacecraft/installed_components.cpp b/src/simulation/spacecraft/installed_components.cpp index 015b606ac..325be3369 100644 --- a/src/simulation/spacecraft/installed_components.cpp +++ b/src/simulation/spacecraft/installed_components.cpp @@ -5,7 +5,7 @@ #include "installed_components.hpp" -#include +#include libra::Vector<3> InstalledComponents::GenerateForce_b_N() { libra::Vector<3> force_b_N_(0.0); diff --git a/src/simulation/spacecraft/installed_components.hpp b/src/simulation/spacecraft/installed_components.hpp index fed441308..5806f6b34 100644 --- a/src/simulation/spacecraft/installed_components.hpp +++ b/src/simulation/spacecraft/installed_components.hpp @@ -6,8 +6,8 @@ #ifndef S2E_SIMULATION_SPACECRAFT_INSTALLED_COMPONENTS_HPP_ #define S2E_SIMULATION_SPACECRAFT_INSTALLED_COMPONENTS_HPP_ -#include -#include +#include +#include /** * @class InstalledComponents diff --git a/src/simulation/spacecraft/spacecraft.cpp b/src/simulation/spacecraft/spacecraft.cpp index c138a95bc..61a7762d4 100644 --- a/src/simulation/spacecraft/spacecraft.cpp +++ b/src/simulation/spacecraft/spacecraft.cpp @@ -5,8 +5,8 @@ #include "spacecraft.hpp" -#include -#include +#include +#include Spacecraft::Spacecraft(const SimulationConfiguration* simulation_configuration, const GlobalEnvironment* global_environment, const int spacecraft_id, RelativeInformation* relative_information) diff --git a/src/simulation/spacecraft/structure/initialize_structure.cpp b/src/simulation/spacecraft/structure/initialize_structure.cpp index 3ad332234..e1def4ea9 100644 --- a/src/simulation/spacecraft/structure/initialize_structure.cpp +++ b/src/simulation/spacecraft/structure/initialize_structure.cpp @@ -5,8 +5,8 @@ #include "initialize_structure.hpp" -#include -#include +#include +#include #define MIN_VAL 1e-6 KinematicsParameters InitKinematicsParameters(std::string file_name) { diff --git a/src/simulation/spacecraft/structure/kinematics_parameters.hpp b/src/simulation/spacecraft/structure/kinematics_parameters.hpp index 2246dcd63..be864b402 100644 --- a/src/simulation/spacecraft/structure/kinematics_parameters.hpp +++ b/src/simulation/spacecraft/structure/kinematics_parameters.hpp @@ -6,8 +6,8 @@ #ifndef S2E_SIMULATION_SPACECRAFT_STRUCTURE_KINEMATICS_PARAMETERS_HPP_ #define S2E_SIMULATION_SPACECRAFT_STRUCTURE_KINEMATICS_PARAMETERS_HPP_ -#include -#include +#include +#include /** * @class KinematicsParameters diff --git a/src/simulation/spacecraft/structure/residual_magnetic_moment.hpp b/src/simulation/spacecraft/structure/residual_magnetic_moment.hpp index e12ecc4dd..f78bd5dea 100644 --- a/src/simulation/spacecraft/structure/residual_magnetic_moment.hpp +++ b/src/simulation/spacecraft/structure/residual_magnetic_moment.hpp @@ -6,7 +6,7 @@ #ifndef S2E_SIMULATION_SPACECRAFT_STRUCTURE_RESIDUAL_MAGNETIC_MOMENT_HPP_ #define S2E_SIMULATION_SPACECRAFT_STRUCTURE_RESIDUAL_MAGNETIC_MOMENT_HPP_ -#include +#include using libra::Vector; /** diff --git a/src/simulation/spacecraft/structure/structure.cpp b/src/simulation/spacecraft/structure/structure.cpp index b16de8b09..bf4510005 100644 --- a/src/simulation/spacecraft/structure/structure.cpp +++ b/src/simulation/spacecraft/structure/structure.cpp @@ -5,7 +5,7 @@ #include "structure.hpp" -#include +#include #include Structure::Structure(const SimulationConfiguration* simulation_configuration, const int spacecraft_id) { diff --git a/src/simulation/spacecraft/structure/surface.hpp b/src/simulation/spacecraft/structure/surface.hpp index ad93c3b0d..c5f573a36 100644 --- a/src/simulation/spacecraft/structure/surface.hpp +++ b/src/simulation/spacecraft/structure/surface.hpp @@ -6,7 +6,7 @@ #ifndef S2E_SIMULATION_SPACECRAFT_STRUCTURE_SURFACE_HPP_ #define S2E_SIMULATION_SPACECRAFT_STRUCTURE_SURFACE_HPP_ -#include +#include /** * @class Surface diff --git a/src/simulation_sample/ground_station/sample_ground_station_components.cpp b/src/simulation_sample/ground_station/sample_ground_station_components.cpp index 53d5e67f3..bf7fbdbb6 100644 --- a/src/simulation_sample/ground_station/sample_ground_station_components.cpp +++ b/src/simulation_sample/ground_station/sample_ground_station_components.cpp @@ -4,7 +4,7 @@ */ #include "sample_ground_station_components.hpp" -#include +#include SampleGsComponents::SampleGsComponents(const SimulationConfiguration* configuration) : configuration_(configuration) { IniAccess iniAccess = IniAccess(configuration_->ground_station_file_list_[0]); diff --git a/src/simulation_sample/spacecraft/sample_components.cpp b/src/simulation_sample/spacecraft/sample_components.cpp index ffe4023a5..c2c6810ac 100644 --- a/src/simulation_sample/spacecraft/sample_components.cpp +++ b/src/simulation_sample/spacecraft/sample_components.cpp @@ -5,7 +5,7 @@ #include "sample_components.hpp" -#include +#include #include "sample_port_configuration.hpp" diff --git a/src/simulation_sample/spacecraft/sample_components.hpp b/src/simulation_sample/spacecraft/sample_components.hpp index abc355bef..9ba706255 100644 --- a/src/simulation_sample/spacecraft/sample_components.hpp +++ b/src/simulation_sample/spacecraft/sample_components.hpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/simulation_sample/spacecraft/sample_spacecraft.cpp b/src/simulation_sample/spacecraft/sample_spacecraft.cpp index c162ffab8..09c7df86c 100644 --- a/src/simulation_sample/spacecraft/sample_spacecraft.cpp +++ b/src/simulation_sample/spacecraft/sample_spacecraft.cpp @@ -6,7 +6,7 @@ #include "sample_spacecraft.hpp" #include -#include +#include #include "sample_components.hpp" diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt new file mode 100644 index 000000000..ce9bef781 --- /dev/null +++ b/src/utilities/CMakeLists.txt @@ -0,0 +1,11 @@ +project(UTILITIES) +cmake_minimum_required(VERSION 3.13) + +add_library(${PROJECT_NAME} STATIC + endian.cpp + slip.cpp + quantization.cpp + ring_buffer.cpp +) + +include(../../common.cmake) diff --git a/src/library/communication/com_port_interface.cpp b/src/utilities/com_port_interface.cpp similarity index 100% rename from src/library/communication/com_port_interface.cpp rename to src/utilities/com_port_interface.cpp diff --git a/src/library/communication/com_port_interface.hpp b/src/utilities/com_port_interface.hpp similarity index 100% rename from src/library/communication/com_port_interface.hpp rename to src/utilities/com_port_interface.hpp diff --git a/src/library/utilities/endian.cpp b/src/utilities/endian.cpp similarity index 100% rename from src/library/utilities/endian.cpp rename to src/utilities/endian.cpp diff --git a/src/library/utilities/endian.hpp b/src/utilities/endian.hpp similarity index 100% rename from src/library/utilities/endian.hpp rename to src/utilities/endian.hpp diff --git a/src/library/utilities/endian_define.hpp b/src/utilities/endian_define.hpp similarity index 100% rename from src/library/utilities/endian_define.hpp rename to src/utilities/endian_define.hpp diff --git a/src/library/utilities/macros.hpp b/src/utilities/macros.hpp similarity index 100% rename from src/library/utilities/macros.hpp rename to src/utilities/macros.hpp diff --git a/src/library/utilities/quantization.cpp b/src/utilities/quantization.cpp similarity index 100% rename from src/library/utilities/quantization.cpp rename to src/utilities/quantization.cpp diff --git a/src/library/utilities/quantization.hpp b/src/utilities/quantization.hpp similarity index 100% rename from src/library/utilities/quantization.hpp rename to src/utilities/quantization.hpp diff --git a/src/library/utilities/ring_buffer.cpp b/src/utilities/ring_buffer.cpp similarity index 100% rename from src/library/utilities/ring_buffer.cpp rename to src/utilities/ring_buffer.cpp diff --git a/src/library/utilities/ring_buffer.hpp b/src/utilities/ring_buffer.hpp similarity index 100% rename from src/library/utilities/ring_buffer.hpp rename to src/utilities/ring_buffer.hpp diff --git a/src/library/utilities/slip.cpp b/src/utilities/slip.cpp similarity index 100% rename from src/library/utilities/slip.cpp rename to src/utilities/slip.cpp diff --git a/src/library/utilities/slip.hpp b/src/utilities/slip.hpp similarity index 100% rename from src/library/utilities/slip.hpp rename to src/utilities/slip.hpp