fix for clang format

ut-issl · Dec 31, 2023 · 180f75b · 180f75b
1 parent 16b862c
commit 180f75b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/s2e-ff/src/components/aocs/initialize_relative_attitude_sensor.cpp b/s2e-ff/src/components/aocs/initialize_relative_attitude_sensor.cpp
@@ -29,8 +29,7 @@ RelativeAttitudeSensor InitializeRelativeAttitudeSensor(ClockGenerator* clock_ge
   // SensorBase
   Sensor<3> sensor_base = ReadSensorInformation<3>(file_name, compo_step_time_s * (double)(prescaler), section, "rad");
 
-  RelativeAttitudeSensor relative_attitude_sensor(prescaler, clock_gen, sensor_base, target_sat_id, reference_sat_id, rel_info,
-                                                  dynamics);
+  RelativeAttitudeSensor relative_attitude_sensor(prescaler, clock_gen, sensor_base, target_sat_id, reference_sat_id, rel_info, dynamics);
 
   return relative_attitude_sensor;
 }
diff --git a/s2e-ff/src/components/aocs/relative_attitude_sensor.hpp b/s2e-ff/src/components/aocs/relative_attitude_sensor.hpp
@@ -56,8 +56,8 @@ class RelativeAttitudeSensor : public Component, public Sensor<3>, public ILogga
   void SetTargetSatId(const int target_sat_id) { target_sat_id_ = target_sat_id; }
 
  protected:
-  int target_sat_id_;                             //!< Target satellite ID
-  const int reference_sat_id_;                    //!< Reference satellite ID
+  int target_sat_id_;           //!< Target satellite ID
+  const int reference_sat_id_;  //!< Reference satellite ID
 
   // Measured value
   libra::Quaternion measured_target_attitude_b_quaternion_;

diff --git a/s2e-ff/src/simulation/spacecraft/ff_components.cpp b/s2e-ff/src/simulation/spacecraft/ff_components.cpp
@@ -29,7 +29,7 @@ FfComponents::FfComponents(const Dynamics* dynamics, const Structure* structure,
   const std::string rel_pos_file = sat_file.ReadString(section_name.c_str(), "relative_position_sensor_file");
   relative_position_sensor_ =
       new RelativePositionSensor(InitializeRelativePositionSensor(clock_gen, rel_pos_file, compo_step_sec, *rel_info_, *dynamics_, sat_id));
-  
+
   const std::string rel_att_file = sat_file.ReadString(section_name.c_str(), "relative_attitude_sensor_file");
   relative_attitude_sensor_ =
       new RelativeAttitudeSensor(InitializeRelativeAttitudeSensor(clock_gen, rel_att_file, compo_step_sec, *rel_info_, *dynamics_, sat_id));

diff --git a/s2e-ff/src/simulation/spacecraft/ff_components.hpp b/s2e-ff/src/simulation/spacecraft/ff_components.hpp
@@ -16,9 +16,9 @@
 #include <components/ideal/force_generator.hpp>
 #include <components/real/cdh/on_board_computer.hpp>
 
+#include "../../components/aocs/initialize_relative_attitude_sensor.hpp"
 #include "../../components/aocs/initialize_relative_distance_sensor.hpp"
 #include "../../components/aocs/initialize_relative_position_sensor.hpp"
-#include "../../components/aocs/initialize_relative_attitude_sensor.hpp"
 #include "../../components/aocs/initialize_relative_velocity_sensor.hpp"
 #include "../../components/aocs/laser_distance_meter.hpp"
 #include "../../components/ideal/initialize_relative_attitude_controller.hpp"

diff --git a/s2e-ff/src/simulation/spacecraft/ff_components_2.hpp b/s2e-ff/src/simulation/spacecraft/ff_components_2.hpp
@@ -17,9 +17,9 @@
 #include <components/real/cdh/on_board_computer.hpp>
 
 #include "../../components/aocs/corner_cube_reflector.hpp"
+#include "../../components/aocs/initialize_relative_attitude_sensor.hpp"
 #include "../../components/aocs/initialize_relative_distance_sensor.hpp"
 #include "../../components/aocs/initialize_relative_position_sensor.hpp"
-#include "../../components/aocs/initialize_relative_attitude_sensor.hpp"
 #include "../../components/ideal/initialize_relative_attitude_controller.hpp"
 
 /**