Merge pull request #71 from ut-issl/develop

Merge develop to main for minor update v0.2.0

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @200km

.github/workflows/actionlint.yml

@@ -9,7 +9,7 @@ jobs:
   actionlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: reviewdog/action-actionlint@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yml

@@ -23,10 +23,10 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: checkout the submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           submodules: recursive
 
@@ -92,10 +92,10 @@ jobs:
         build_bit: ['BUILD_64BIT=OFF', 'BUILD_64BIT=ON']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: checkout the submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           submodules: recursive
 

.github/workflows/check-format.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           fetch-depth: 2
 

.github/workflows/google_test.yml

@@ -27,10 +27,10 @@ jobs:
         compiler: ['gcc-11 g++-11', 'clang clang++']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: checkout the submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           submodules: recursive
 

.github/workflows/labeler.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@v4
+        uses: crazy-max/ghaction-github-labeler@v5
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           yaml-file: .github/labels.yml

.github/workflows/validate-renovate.yml

@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/setup-node@v4
 
       - name: install
         run: |

s2e-ff/CMakeLists.txt

@@ -32,76 +32,37 @@ set(NRLMSISE00_DIR ${EXT_LIB_DIR}/nrlmsise00)
 include_directories(${CSPICE_DIR}/include)
 include_directories(${NRLMSISE00_DIR}/src)
 include_directories(${S2E_CORE_DIR}/src)
-include_directories(${S2E_CORE_DIR}/src/Library/math)
-include_directories(${S2E_CORE_DIR}/src/Library/utils)
-include_directories(${S2E_CORE_DIR}/src/Dynamics)
-include_directories(${S2E_CORE_DIR}/src/Disturbance)
-include_directories(${S2E_CORE_DIR}/src/Interface/InitInput)
-include_directories(${S2E_CORE_DIR}/src/Interface/LogOutput)
-include_directories(${S2E_CORE_DIR}/src/Interface/SpacecraftInOut/Ports)
-include_directories(${S2E_CORE_DIR}/src/Simulation)
-include_directories(${S2E_CORE_DIR}/src/Simulation/MCSim)
-include_directories(${S2E_CORE_DIR}/src/Simulation/Spacecraft)
-include_directories(${S2E_CORE_DIR}/src/Simulation/Spacecraft/Structure)
-include_directories(${S2E_CORE_DIR}/src/Simulation/GroundStation)
-include_directories(${S2E_CORE_DIR}/src/Simulation/Case)
-include_directories(${S2E_CORE_DIR}/src/Disturbance)
-include_directories(${S2E_CORE_DIR}/src/Environment/Global)
-include_directories(${S2E_CORE_DIR}/src/Environment/Local)
-include_directories(${S2E_CORE_DIR}/src/Component)
-include_directories(${S2E_CORE_DIR}/src/Component/Abstract)
-include_directories(${S2E_CORE_DIR}/src/Component/AOCS)
-include_directories(${S2E_CORE_DIR}/src/Component/CDH)
-include_directories(${S2E_CORE_DIR}/src/Component/CommGS)
-include_directories(${S2E_CORE_DIR}/src/Component/Mission/Telescope)
-include_directories(${S2E_CORE_DIR}/src/Component/Power)
-include_directories(${S2E_CORE_DIR}/src/Component/Propulsion)
-include_directories(${S2E_CORE_DIR}/src/Component/Thermal)
-include_directories(${S2E_CORE_DIR}/src/RelativeInformation)
 
 ## add_subdirectories
-add_subdirectory(${S2E_CORE_DIR}/src/Component S2E_CORE/Component)
-add_subdirectory(${S2E_CORE_DIR}/src/Disturbance S2E_CORE/Disturbance)
-add_subdirectory(${S2E_CORE_DIR}/src/Dynamics S2E_CORE/Dynamics)
-add_subdirectory(${S2E_CORE_DIR}/src/Environment/Global S2E_CORE/Environment/Global)
-add_subdirectory(${S2E_CORE_DIR}/src/Environment/Local S2E_CORE/Environment/Local)
-add_subdirectory(${S2E_CORE_DIR}/src/RelativeInformation S2E_CORE/RelativeInformation)
-add_subdirectory(${S2E_CORE_DIR}/src/Interface/InitInput S2E_CORE/InitInput)
-add_subdirectory(${S2E_CORE_DIR}/src/Interface/LogOutput S2E_CORE/LogOutput)
-add_subdirectory(${S2E_CORE_DIR}/src/Interface/SpacecraftInOut S2E_CORE/SpacecraftInOut)
-add_subdirectory(${S2E_CORE_DIR}/src/Interface/HilsInOut S2E_CORE/HilsInOut)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/igrf S2E_CORE/igrf)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/inih S2E_CORE/inih)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/math S2E_CORE/math)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/nrlmsise00 S2E_CORE/nrlmsise00)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/sgp4 S2E_CORE/sgp4)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/utils S2E_CORE/utils)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/optics S2E_CORE/optics)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/RelativeOrbit S2E_CORE/RelativeOrbit)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/Orbit S2E_CORE/Orbit)
-add_subdirectory(${S2E_CORE_DIR}/src/Library/Geodesy S2E_CORE/Geodesy)
-add_subdirectory(${S2E_CORE_DIR}/src/Simulation S2E_CORE/Simulation)
+add_subdirectory(${S2E_CORE_DIR}/src/components s2e_core/components)
+add_subdirectory(${S2E_CORE_DIR}/src/disturbances s2e_core/disturbances)
+add_subdirectory(${S2E_CORE_DIR}/src/dynamics s2e_core/dynamics)
+add_subdirectory(${S2E_CORE_DIR}/src/environment/global s2e_core/environment/global)
+add_subdirectory(${S2E_CORE_DIR}/src/environment/local s2e_core/environment/local)
+add_subdirectory(${S2E_CORE_DIR}/src/library s2e_core/library)
+add_subdirectory(${S2E_CORE_DIR}/src/simulation s2e_core/simulation)
+
 
 set(SOURCE_FILES
-  src/S2eFf.cpp
-  src/Components/AOCS/RelativeDistanceSensor.cpp
-  src/Components/AOCS/InitializeRelativeDistanceSensor.cpp
-  src/Components/AOCS/RelativePositionSensor.cpp
-  src/Components/AOCS/InitializeRelativePositionSensor.cpp
-  src/Components/AOCS/RelativeVelocitySensor.cpp
-  src/Components/AOCS/InitializeRelativeVelocitySensor.cpp
-  src/Components/IdealComponents/RelativeAttitudeController.cpp
-  src/Components/IdealComponents/InitializeRelativeAttitudeController.cpp
-  src/Library/math/DualQuaternion.cpp
-  src/Library/math/RotationFirstDualQuaternion.cpp
-  src/Library/math/TranslationFirstDualQuaternion.cpp
-  src/Library/Orbit/QuasiNonsingularOrbitalElements.cpp
-  src/Library/RelativeOrbit/QuasiNonsingularRelativeOrbitalElements.cpp
-  src/Library/RelativeOrbit/QuasiNonsingularOrbitalElementDifferences.cpp
-  src/Simulation/Case/FfCase.cpp
-  src/Simulation/Spacecraft/FfSat.cpp
-  src/Simulation/Spacecraft/FfComponents.cpp
-  src/Simulation/Spacecraft/FfComponents2.cpp
+  src/s2e_ff.cpp
+  src/components/aocs/relative_distance_sensor.cpp
+  src/components/aocs/initialize_relative_distance_sensor.cpp
+  src/components/aocs/relative_position_sensor.cpp
+  src/components/aocs/initialize_relative_position_sensor.cpp
+  src/components/aocs/relative_velocity_sensor.cpp
+  src/components/aocs/initialize_relative_velocity_sensor.cpp
+  src/components/ideal/relative_attitude_controller.cpp
+  src/components/ideal/initialize_relative_attitude_controller.cpp
+  src/library/math/dual_quaternion.cpp
+  src/library/math/rotation_first_dual_quaternion.cpp
+  src/library/math/translation_first_dual_quaternion.cpp
+  src/library/orbit/quasi_nonsingular_orbital_elements.cpp
+  src/library/relative_orbit/quasi_nonsingular_relative_orbital_elements.cpp
+  src/library/relative_orbit/quasi_nonsingular_orbital_element_differences.cpp
+  src/simulation/case/ff_case.cpp
+  src/simulation/spacecraft/ff_satellite.cpp
+  src/simulation/spacecraft/ff_components.cpp
+  src/simulation/spacecraft/ff_components_2.cpp
 )
 # Create executable file
 add_executable(${PROJECT_NAME} ${SOURCE_FILES})
@@ -163,22 +124,20 @@ set(S2E_LIBRARIES
   IGRF WRAPPER_NRLMSISE00 INIH SGP4 UTIL OPTICS RELATIVE_ORBIT_MODELS ORBIT_MODELS GEODESY MATH
 )
 # Initialize link
-target_link_libraries(COMPONENT DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT SC_IO RELATIVE_INFO ${S2E_LIBRARIES})
-target_link_libraries(DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT SIMULATION ${S2E_LIBRARIES})
-target_link_libraries(DISTURBANCE DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT ${S2E_LIBRARIES})
-target_link_libraries(SIMULATION DYNAMICS GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT DISTURBANCE ${S2E_LIBRARIES})
-target_link_libraries(GLOBAL_ENVIRONMENT ${CSPICE_LIB} ${S2E_LIBRARIES})
-target_link_libraries(LOCAL_ENVIRONMENT GLOBAL_ENVIRONMENT ${CSPICE_LIB} ${S2E_LIBRARIES})
-target_link_libraries(WRAPPER_NRLMSISE00 ${NRLMSISE00_LIB})
+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(${PROJECT_NAME} DYNAMICS)
 target_link_libraries(${PROJECT_NAME} DISTURBANCE)
 target_link_libraries(${PROJECT_NAME} SIMULATION)
 target_link_libraries(${PROJECT_NAME} GLOBAL_ENVIRONMENT LOCAL_ENVIRONMENT)
-target_link_libraries(${PROJECT_NAME} RELATIVE_INFO)
-target_link_libraries(${PROJECT_NAME} INI_ACC LOG_OUT SC_IO)
 target_link_libraries(${PROJECT_NAME} COMPONENT)
-target_link_libraries(${PROJECT_NAME} HILS_IO)
+
 
 ## Cmake debug
 message("Cspice_LIB:  " ${CSPICE_LIB})
@@ -203,24 +162,24 @@ if(GOOGLE_TEST)
   set(TEST_PROJECT_NAME ${PROJECT_NAME}_TEST)
   set(TEST_FILES
     # Dual Quaternion
-    src/Library/math/DualQuaternion.cpp
-    test/TestDualQuaternion.cpp
-    src/Library/math/RotationFirstDualQuaternion.cpp
-    test/TestRotationFirstDualQuaternion.cpp
-    src/Library/math/TranslationFirstDualQuaternion.cpp
-    test/TestTranslationFirstDualQuaternion.cpp
+    src/library/math/dual_quaternion.cpp
+    test/test_dual_quaternion.cpp
+    src/library/math/rotation_first_dual_quaternion.cpp
+    test/test_rotation_first_dual_quaternion.cpp
+    src/library/math/translation_first_dual_quaternion.cpp
+    test/test_translation_first_dual_quaternion.cpp
     # Orbital elements
-    src/Library/Orbit/QuasiNonsingularOrbitalElements.cpp
-    test/TestQuasiNonsingularOrbitalElements.cpp
+    src/library/orbit/quasi_nonsingular_orbital_elements.cpp
+    test/test_quasi_nonsingular_orbital_elements.cpp
     # Relative orbital elements
-    src/Library/RelativeOrbit/QuasiNonsingularOrbitalElementDifferences.cpp
-    test/TestQuasiNonsingularOrbitalElementDifferences.cpp
-    src/Library/RelativeOrbit/QuasiNonsingularRelativeOrbitalElements.cpp
-    test/TestQuasiNonsingularRelativeOrbitalElements.cpp
+    src/library/relative_orbit/quasi_nonsingular_orbital_element_differences.cpp
+    test/test_quasi_nonsingular_orbital_element_differences.cpp
+    src/library/relative_orbit/quasi_nonsingular_relative_orbital_elements.cpp
+    test/test_quasi_nonsingular_relative_orbital_elements.cpp
   )
   add_executable(${TEST_PROJECT_NAME} ${TEST_FILES})
   target_link_libraries(${TEST_PROJECT_NAME} gtest gtest_main)
-  target_link_libraries(${TEST_PROJECT_NAME} MATH)
+  target_link_libraries(${TEST_PROJECT_NAME} LIBRARY)
   include_directories(${TEST_PROJECT_NAME})
   add_test(NAME s2e-test COMMAND ${TEST_PROJECT_NAME})
   enable_testing()