Skip to content

Commit 8ee514e

Browse files
alex-liang3alex-liang3
authored
style: re-run format with clang 18 (#528)
1 parent c9cc2ac commit 8ee514e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+371
-589
lines changed

‎bindings/python/src/OpenSpaceToolkitAstrodynamicsPy/Dynamics.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ class PyDynamics : public Dynamics
5656
);
5757
}
5858

59-
VectorXd computeContribution(
60-
const Instant& anInstant, const VectorXd& x, const Shared<const Frame>& aFrameSPtr
61-
) const override
59+
VectorXd computeContribution(const Instant& anInstant, const VectorXd& x, const Shared<const Frame>& aFrameSPtr)
60+
const override
6261
{
6362
PYBIND11_OVERRIDE_PURE_NAME(
6463
VectorXd, Dynamics, "compute_contribution", computeContribution, anInstant, x, aFrameSPtr

‎bindings/python/src/OpenSpaceToolkitAstrodynamicsPy/Dynamics/Thruster.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ class PyThruster : public Thruster
5252
);
5353
}
5454

55-
VectorXd computeContribution(
56-
const Instant& anInstant, const VectorXd& x, const Shared<const Frame>& aFrameSPtr
57-
) const override
55+
VectorXd computeContribution(const Instant& anInstant, const VectorXd& x, const Shared<const Frame>& aFrameSPtr)
56+
const override
5857
{
5958
PYBIND11_OVERRIDE_PURE_NAME(
6059
VectorXd, Thruster, "compute_contribution", computeContribution, anInstant, x, aFrameSPtr

‎bindings/python/src/OpenSpaceToolkitAstrodynamicsPy/Trajectory/Orbit/Model/Kepler/BrouwerLyddaneMean.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,8 @@ inline void OpenSpaceToolkitAstrodynamicsPy_Trajectory_Orbit_Model_BrouwerLyddan
153153
// Create "brouwerLyddaneMean" python submodule
154154
auto brouwerLyddaneMean = aModule.def_submodule("brouwerLyddaneMean");
155155

156-
OpenSpaceToolkitAstrodynamicsPy_Trajectory_Orbit_Model_BrouwerLyddaneMean_BrouwerLyddaneMeanShort(
157-
brouwerLyddaneMean
156+
OpenSpaceToolkitAstrodynamicsPy_Trajectory_Orbit_Model_BrouwerLyddaneMean_BrouwerLyddaneMeanShort(brouwerLyddaneMean
158157
);
159-
OpenSpaceToolkitAstrodynamicsPy_Trajectory_Orbit_Model_BrouwerLyddaneMean_BrouwerLyddaneMeanLong(
160-
brouwerLyddaneMean
158+
OpenSpaceToolkitAstrodynamicsPy_Trajectory_Orbit_Model_BrouwerLyddaneMean_BrouwerLyddaneMeanLong(brouwerLyddaneMean
161159
);
162160
}

‎include/OpenSpaceToolkit/Astrodynamics/Solver/TemporalConditionSolver.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ class TemporalConditionSolver
7878
/// @param anInterval A time interval within which to perform the search.
7979
///
8080
/// @return An array of time intervals.
81-
Array<Interval> solve(
82-
const Array<TemporalConditionSolver::Condition>& aConditionArray, const Interval& anInterval
83-
) const;
81+
Array<Interval> solve(const Array<TemporalConditionSolver::Condition>& aConditionArray, const Interval& anInterval)
82+
const;
8483

8584
private:
8685
Duration timeStep_;

‎include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/BrouwerLyddaneMean/BrouwerLyddaneMean.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,8 @@ class BrouwerLyddaneMean : public COE
9595
/// @param aGravitationalParameter A gravitational parameter
9696
/// @param aFrameSPtr A frame
9797
/// @return Cartesian state
98-
COE::CartesianState getCartesianState(
99-
const Derived &aGravitationalParameter, const Shared<const Frame> &aFrameSPtr
100-
) const;
98+
COE::CartesianState getCartesianState(const Derived &aGravitationalParameter, const Shared<const Frame> &aFrameSPtr)
99+
const;
101100

102101
/// @brief Convert to COE
103102
///

‎include/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,8 @@ class COE
215215
/// @param aGravitationalParameter A gravitational parameter
216216
/// @param aFrameSPtr A frame
217217
/// @return Cartesian state
218-
COE::CartesianState getCartesianState(
219-
const Derived& aGravitationalParameter, const Shared<const Frame>& aFrameSPtr
220-
) const;
218+
COE::CartesianState getCartesianState(const Derived& aGravitationalParameter, const Shared<const Frame>& aFrameSPtr)
219+
const;
221220

222221
/// @brief Get vector of elements in SI units
223222
///

‎include/OpenSpaceToolkit/Astrodynamics/Trajectory/Segment.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,8 @@ class Segment
125125
/// @param aNumericalSolver a numerical solver to use for the propagation between states
126126
/// @param anInstantArray an array of instants
127127
/// @return States at specified instants
128-
Array<State> calculateStatesAt(
129-
const Array<Instant>& anInstantArray, const NumericalSolver& aNumericalSolver
130-
) const;
128+
Array<State> calculateStatesAt(const Array<Instant>& anInstantArray, const NumericalSolver& aNumericalSolver)
129+
const;
131130

132131
/// @brief Get dynamics contribution
133132
///

‎include/OpenSpaceToolkit/Astrodynamics/Trajectory/Sequence.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ class Sequence
9797
/// @param anInstantArray An array of instants.
9898
/// @param aNumericalSolver A numerical solver to be used for the propagation.
9999
/// @return Array of states at provided instants.
100-
Array<State> calculateStatesAt(
101-
const Array<Instant>& anInstantArray, const NumericalSolver& aNumericalSolver
102-
) const;
100+
Array<State> calculateStatesAt(const Array<Instant>& anInstantArray, const NumericalSolver& aNumericalSolver)
101+
const;
103102

104103
/// @brief Print the sequence solution
105104
///

‎src/OpenSpaceToolkit/Astrodynamics/Access/Generator.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,9 @@ AccessTarget AccessTarget::FromLLA(
100100
return AccessTarget(
101101
AccessTarget::Type::Fixed,
102102
aVisibilityCriterion,
103-
Trajectory::Position(
104-
Position::Meters(
105-
anLLA.toCartesian(aCelestialSPtr->getEquatorialRadius(), aCelestialSPtr->getFlattening()), Frame::ITRF()
106-
)
107-
)
103+
Trajectory::Position(Position::Meters(
104+
anLLA.toCartesian(aCelestialSPtr->getEquatorialRadius(), aCelestialSPtr->getFlattening()), Frame::ITRF()
105+
))
108106
);
109107
}
110108

@@ -474,8 +472,7 @@ Array<Array<Access>> Generator::computeAccessesForFixedTargets(
474472
}
475473
);
476474

477-
const auto computeAer = [&SEZRotations, &fromPositionCoordinates_ITRF](
478-
const Vector3d& aToPositionCoordinates_ITRF
475+
const auto computeAer = [&SEZRotations, &fromPositionCoordinates_ITRF](const Vector3d& aToPositionCoordinates_ITRF
479476
) -> Triple<VectorXd, VectorXd, VectorXd>
480477
{
481478
const MatrixXd dx = (-fromPositionCoordinates_ITRF).colwise() + aToPositionCoordinates_ITRF;
@@ -508,8 +505,8 @@ Array<Array<Access>> Generator::computeAccessesForFixedTargets(
508505
return {azimuth_rad, elevation_rad, range_m};
509506
};
510507

511-
const auto computeElevations =
512-
[&fromPositionCoordinates_ITRF](const Vector3d& aToPositionCoordinates_ITRF) -> VectorXd
508+
const auto computeElevations = [&fromPositionCoordinates_ITRF](const Vector3d& aToPositionCoordinates_ITRF
509+
) -> VectorXd
513510
{
514511
const MatrixXd dx = (-fromPositionCoordinates_ITRF).colwise() + aToPositionCoordinates_ITRF;
515512
const MatrixXd fromPositionDirection_ITRF = fromPositionCoordinates_ITRF.colwise().normalized();
@@ -748,8 +745,8 @@ Array<physics::time::Interval> Generator::computePreciseCrossings(
748745

749746
std::function<bool(const Instant&)> condition;
750747

751-
const auto computeAER =
752-
[&fromPositionCoordinate_ITRF, &SEZRotation, &aToTrajectory](const Instant& instant) -> Triple<Real, Real, Real>
748+
const auto computeAER = [&fromPositionCoordinate_ITRF, &SEZRotation, &aToTrajectory](const Instant& instant
749+
) -> Triple<Real, Real, Real>
753750
{
754751
const Vector3d toPositionCoordinates_ITRF =
755752
aToTrajectory.getStateAt(instant).inFrame(Frame::ITRF()).getPosition().getCoordinates();

‎src/OpenSpaceToolkit/Astrodynamics/Estimator/TLESolver.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ TLESolver::Analysis TLESolver::estimate(
197197
{
198198
if (estimateBStar_)
199199
{
200-
throw ostk::core::error::RuntimeError(
201-
"Initial guess must be a TLE or (State, B*) when also estimating B*."
200+
throw ostk::core::error::RuntimeError("Initial guess must be a TLE or (State, B*) when also estimating B*."
202201
);
203202
}
204203
initialGuessTLEState = CartesianStateAndBStarToTLEState(*state);

‎src/OpenSpaceToolkit/Astrodynamics/EventCondition/AngularCondition.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,9 @@ AngularCondition::AngularCondition(
206206
return (currentValue >= lowerBound) && (currentValue <= upperBound);
207207
}
208208
),
209-
targetRange_(
210-
std::make_pair(
211-
aTargetRange.first.inRadians(0.0, Real::TwoPi()), aTargetRange.second.inRadians(0.0, Real::TwoPi())
212-
)
213-
)
209+
targetRange_(std::make_pair(
210+
aTargetRange.first.inRadians(0.0, Real::TwoPi()), aTargetRange.second.inRadians(0.0, Real::TwoPi())
211+
))
214212
{
215213
}
216214

‎src/OpenSpaceToolkit/Astrodynamics/Flight/Maneuver.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ Maneuver::Maneuver(const Array<State>& aStateArray)
6161
}
6262
))
6363
{
64-
throw ostk::core::error::RuntimeError(
65-
String::Format("{} not found in states.", coordinateSubset->getName())
64+
throw ostk::core::error::RuntimeError(String::Format("{} not found in states.", coordinateSubset->getName())
6665
);
6766
}
6867
}

‎src/OpenSpaceToolkit/Astrodynamics/Trajectory/LocalOrbitalFrameDirection.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,12 @@ void LocalOrbitalFrameDirection::print(std::ostream& anOutputStream, bool displa
6262

6363
ostk::core::utils::Print::Line(anOutputStream)
6464
<< "Value:" << (this->getValue().isDefined() ? this->getValue().toString() : "Undefined");
65-
ostk::core::utils::Print::Line(anOutputStream)
66-
<< "Local Orbital Frame Factory Type:"
67-
<< (((this->getLocalOrbitalFrameFactory() != nullptr) && (this->getLocalOrbitalFrameFactory()->isDefined()))
68-
? LocalOrbitalFrameTransformProvider::StringFromType(
69-
this->getLocalOrbitalFrameFactory()->getProviderType()
70-
)
71-
: "Undefined");
65+
ostk::core::utils::Print::Line(anOutputStream
66+
) << "Local Orbital Frame Factory Type:"
67+
<< (((this->getLocalOrbitalFrameFactory() != nullptr) && (this->getLocalOrbitalFrameFactory()->isDefined()))
68+
? LocalOrbitalFrameTransformProvider::StringFromType(this->getLocalOrbitalFrameFactory()->getProviderType(
69+
))
70+
: "Undefined");
7271

7372
displayDecorator ? ostk::core::utils::Print::Footer(anOutputStream) : void();
7473
}

‎src/OpenSpaceToolkit/Astrodynamics/Trajectory/Model/Tabulated.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,12 @@ State Tabulated::calculateStateAt(const Instant& anInstant) const
138138

139139
if (anInstant < firstState_.accessInstant() || anInstant > lastState_.accessInstant())
140140
{
141-
throw ostk::core::error::RuntimeError(
142-
String::Format(
143-
"Provided instant [{}] is outside of interpolation range [{}, {}].",
144-
anInstant.toString(),
145-
firstState_.accessInstant().toString(),
146-
lastState_.accessInstant().toString()
147-
)
148-
);
141+
throw ostk::core::error::RuntimeError(String::Format(
142+
"Provided instant [{}] is outside of interpolation range [{}, {}].",
143+
anInstant.toString(),
144+
firstState_.accessInstant().toString(),
145+
lastState_.accessInstant().toString()
146+
));
149147
}
150148

151149
VectorXd interpolatedCoordinates(interpolators_.getSize());

‎src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -991,14 +991,13 @@ Orbit Orbit::SunSynchronous(
991991

992992
// Ecliptic latitude of the Sun
993993

994-
const Real sunEclipticLatitude_rad = Angle::Degrees(
995-
std::fmod(
996-
sunMeanLongitude_deg + 1.914666471 * std::sin(sunMeanAnomaly_rad) +
997-
0.019994643 * std::sin(2.0 * sunMeanAnomaly_rad),
998-
360.0
999-
)
1000-
)
1001-
.inRadians();
994+
const Real sunEclipticLatitude_rad =
995+
Angle::Degrees(std::fmod(
996+
sunMeanLongitude_deg + 1.914666471 * std::sin(sunMeanAnomaly_rad) +
997+
0.019994643 * std::sin(2.0 * sunMeanAnomaly_rad),
998+
360.0
999+
))
1000+
.inRadians();
10021001

10031002
// Compute the equation of time
10041003

‎src/OpenSpaceToolkit/Astrodynamics/Trajectory/Orbit/Model/Kepler/COE.cpp

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,11 @@ Length COE::getRadialDistance() const
224224
throw ostk::core::error::runtime::Undefined("COE");
225225
}
226226

227-
return Length::Meters(
228-
COE::ComputeRadialDistance(
229-
semiMajorAxis_.inMeters(),
230-
eccentricity_,
231-
COE::ConvertAnomaly(anomaly_, eccentricity_, anomalyType_, AnomalyType::True, 1e-12).inRadians()
232-
)
233-
);
227+
return Length::Meters(COE::ComputeRadialDistance(
228+
semiMajorAxis_.inMeters(),
229+
eccentricity_,
230+
COE::ConvertAnomaly(anomaly_, eccentricity_, anomalyType_, AnomalyType::True, 1e-12).inRadians()
231+
));
234232
}
235233

236234
Derived COE::getAngularMomentum(const Derived& aGravitationalParameter) const
@@ -1197,14 +1195,13 @@ Angle COE::ComputeEquationOfTime(const Instant& anInstant)
11971195
const Real sunMeanAnomaly_rad = Angle::Degrees(std::fmod(357.5291092 + 35999.05034 * T_UT1, 360.0)).inRadians();
11981196

11991197
// Ecliptic latitude of the Sun
1200-
const Real sunEclipticLatitude_rad = Angle::Degrees(
1201-
std::fmod(
1202-
sunMeanLongitude_deg + 1.914666471 * std::sin(sunMeanAnomaly_rad) +
1203-
0.019994643 * std::sin(2.0 * sunMeanAnomaly_rad),
1204-
360.0
1205-
)
1206-
)
1207-
.inRadians();
1198+
const Real sunEclipticLatitude_rad =
1199+
Angle::Degrees(std::fmod(
1200+
sunMeanLongitude_deg + 1.914666471 * std::sin(sunMeanAnomaly_rad) +
1201+
0.019994643 * std::sin(2.0 * sunMeanAnomaly_rad),
1202+
360.0
1203+
))
1204+
.inRadians();
12081205

12091206
// Compute the equation of time
12101207
const Real equationOfTime_deg =

‎src/OpenSpaceToolkit/Astrodynamics/Trajectory/Segment.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,12 +302,10 @@ MatrixXd Segment::Solution::getDynamicsContribution(
302302
{
303303
if (!dynamicsWriteCoordinateSubsets.contains(aCoordinateSubsetSPtr))
304304
{
305-
throw ostk::core::error::RuntimeError(
306-
String::Format(
307-
"Provided coordinate subset [{}] is not part of the dynamics write coordinate subsets.",
308-
aCoordinateSubsetSPtr->getName()
309-
)
310-
);
305+
throw ostk::core::error::RuntimeError(String::Format(
306+
"Provided coordinate subset [{}] is not part of the dynamics write coordinate subsets.",
307+
aCoordinateSubsetSPtr->getName()
308+
));
311309
}
312310
}
313311

@@ -365,8 +363,7 @@ MatrixXd Segment::Solution::getDynamicsAccelerationContribution(
365363
return this->getDynamicsContribution(aDynamicsSPtr, aFrameSPtr, {CartesianVelocity::Default()});
366364
}
367365

368-
Map<Shared<Dynamics>, MatrixXd> Segment::Solution::getAllDynamicsContributions(
369-
const Shared<const Frame>& aFrameSPtr
366+
Map<Shared<Dynamics>, MatrixXd> Segment::Solution::getAllDynamicsContributions(const Shared<const Frame>& aFrameSPtr
370367
) const
371368
{
372369
// TBI: Use smart caching for multiple calls in the future

‎test/OpenSpaceToolkit/Astrodynamics/Access/Generator.test.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,12 +1074,9 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Access_Generator, ComputeAccesses_5)
10741074
Length::Meters(0.0),
10751075
};
10761076

1077-
const Trajectory trajectory = Trajectory::Position(
1078-
Position::Meters(
1079-
lla.toCartesian(defaultEarthSPtr_->getEquatorialRadius(), defaultEarthSPtr_->getFlattening()),
1080-
Frame::ITRF()
1081-
)
1082-
);
1077+
const Trajectory trajectory = Trajectory::Position(Position::Meters(
1078+
lla.toCartesian(defaultEarthSPtr_->getEquatorialRadius(), defaultEarthSPtr_->getFlattening()), Frame::ITRF()
1079+
));
10831080

10841081
const VisibilityCriterion visibilityCriterion =
10851082
VisibilityCriterion::FromElevationInterval(ostk::mathematics::object::Interval<Real>::Closed(5.0, 90.0));
@@ -1211,9 +1208,9 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Access_Generator, AerRanges_1)
12111208

12121209
// Reference data setup
12131210

1214-
const File referenceDataFile = File::Path(
1215-
Path::Parse("/app/test/OpenSpaceToolkit/Astrodynamics/Access/Generator/AerRanges/Scenario 1.csv")
1216-
);
1211+
const File referenceDataFile =
1212+
File::Path(Path::Parse("/app/test/OpenSpaceToolkit/Astrodynamics/Access/Generator/AerRanges/Scenario 1.csv")
1213+
);
12171214

12181215
const Table referenceData = Table::Load(referenceDataFile, Table::Format::CSV, true);
12191216

‎test/OpenSpaceToolkit/Astrodynamics/Access/VisibilityCriterion.test.cpp

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Access_VisibilityCriterion, Constructor)
4141
const Interval<Real> elevationInterval = Interval<Real>::Closed(0.0, 90.0);
4242
const Interval<Real> rangeInterval = Interval<Real>::Closed(0.0, 1e6);
4343

44-
EXPECT_NO_THROW(
45-
VisibilityCriterion visibilityCriterion =
46-
VisibilityCriterion::FromAERInterval(azimuthInterval, elevationInterval, rangeInterval);
47-
);
44+
EXPECT_NO_THROW(VisibilityCriterion visibilityCriterion =
45+
VisibilityCriterion::FromAERInterval(azimuthInterval, elevationInterval, rangeInterval););
4846

4947
// Undefined
5048

@@ -110,10 +108,8 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Access_VisibilityCriterion, Constructor)
110108
const Map<Real, Real> azimuthElevationMask = {{0.0, 10.0}, {90.0, 15.0}, {180.0, 20.0}};
111109
const Interval<Real> rangeInterval = Interval<Real>::Closed(0.0, 1e6);
112110

113-
EXPECT_NO_THROW(
114-
VisibilityCriterion visibilityCriterion =
115-
VisibilityCriterion::FromAERMask(azimuthElevationMask, rangeInterval);
116-
);
111+
EXPECT_NO_THROW(VisibilityCriterion visibilityCriterion =
112+
VisibilityCriterion::FromAERMask(azimuthElevationMask, rangeInterval););
117113
}
118114

119115
// Incorrect bounds
@@ -168,24 +164,21 @@ TEST_F(OpenSpaceToolkit_Astrodynamics_Access_VisibilityCriterion, Constructor)
168164

169165
// FromLineOfSight
170166
{
171-
EXPECT_NO_THROW(
172-
VisibilityCriterion visibilityCriterion = VisibilityCriterion::FromLineOfSight(defaultEnvironment_);
173-
);
167+
EXPECT_NO_THROW(VisibilityCriterion visibilityCriterion =
168+
VisibilityCriterion::FromLineOfSight(defaultEnvironment_););
174169
}
175170

176171
// FromElevationInterval
177172
{
178173
const Interval<Real> elevationInterval = Interval<Real>::Closed(0.0, 90.0);
179174

180-
EXPECT_NO_THROW(
181-
VisibilityCriterion visibilityCriterion = VisibilityCriterion::FromElevationInterval(elevationInterval);
182-
);
175+
EXPECT_NO_THROW(VisibilityCriterion visibilityCriterion =
176+
VisibilityCriterion::FromElevationInterval(elevationInterval););
183177

184178
// Incorrect bounds
185179
{
186180
EXPECT_THROW(
187-
VisibilityCriterion::FromElevationInterval(
188-
ostk::mathematics::object::Interval<Real>::Closed(-91.0, 0.0)
181+
VisibilityCriterion::FromElevationInterval(ostk::mathematics::object::Interval<Real>::Closed(-91.0, 0.0)
189182
),
190183
ostk::core::error::RuntimeError
191184
);

0 commit comments

Comments
 (0)