Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: reapply clang-format #318

Merged
merged 1 commit into from
Jan 27, 2025
Merged

style: reapply clang-format #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate(pybind11::module& aModule)
OpenSpaceToolkitPhysicsPy_Coordinate_Velocity(coordinate);
OpenSpaceToolkitPhysicsPy_Coordinate_Frame(coordinate);
OpenSpaceToolkitPhysicsPy_Coordinate_Transform(coordinate);
OpenSpaceToolkitPhysicsPy_Coordinate_Axes(coordinate
OpenSpaceToolkitPhysicsPy_Coordinate_Axes(
coordinate
); // Cannot be binded without Frame.cpp (class forward declared)
}
24 changes: 13 additions & 11 deletions bindings/python/src/OpenSpaceToolkitPhysicsPy/Unit/Derived.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,17 +272,19 @@ inline void OpenSpaceToolkitPhysicsPy_Unit_Derived(pybind11::module& aModule)
)doc"
)

.def(init<
const Length::Unit&,
const Derived::Order&,
const Mass::Unit&,
const Derived::Order&,
const Time::Unit&,
const Derived::Order&,
const ElectricCurrent::Unit&,
const Derived::Order&,
const Angle::Unit&,
const Derived::Order&>())
.def(
init<
const Length::Unit&,
const Derived::Order&,
const Mass::Unit&,
const Derived::Order&,
const Time::Unit&,
const Derived::Order&,
const ElectricCurrent::Unit&,
const Derived::Order&,
const Angle::Unit&,
const Derived::Order&>()
)

.def(self == self)
.def(self != self)
Expand Down
5 changes: 2 additions & 3 deletions bindings/python/thirdparty/boost_numpy_eigen/eigen_numpy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,8 @@ struct EigenTensorToPython
shape[i_dimension] = static_cast<npy_intp>(tensor.dimension(i_dimension));
}

PyArrayObject* python_array = (PyArrayObject*)PyArray_SimpleNew(
num_dimensions, shape, NumpyEquivalentType<typename TensorType::Scalar>::type_code
);
PyArrayObject* python_array = (PyArrayObject*
)PyArray_SimpleNew(num_dimensions, shape, NumpyEquivalentType<typename TensorType::Scalar>::type_code);

copy_tensor(
tensor.data(),
Expand Down
2 changes: 1 addition & 1 deletion include/OpenSpaceToolkit/Physics/Environment/Ephemeris/SPICE/Manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#include <OpenSpaceToolkit/Physics/Coordinate/Frame.hpp>
#include <OpenSpaceToolkit/Physics/Coordinate/Transform.hpp>
#include <OpenSpaceToolkit/Physics/Data/Manager.hpp>
#include <OpenSpaceToolkit/Physics/Manager.hpp>
#include <OpenSpaceToolkit/Physics/Environment/Ephemeris/SPICE.hpp>
#include <OpenSpaceToolkit/Physics/Environment/Ephemeris/SPICE/Kernel.hpp>
#include <OpenSpaceToolkit/Physics/Manager.hpp>
#include <OpenSpaceToolkit/Physics/Time/Instant.hpp>

#define OSTK_PHYSICS_ENVIRONMENT_EPHEMERIS_SPICE_MANAGER_LOCAL_REPOSITORY \
Expand Down
3 changes: 2 additions & 1 deletion include/OpenSpaceToolkit/Physics/Manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ class Manager

static Manager::Mode DefaultMode_(const String& aManagerModeEnvironmentVariableName);

static Duration DefaultLocalRepositoryLockTimeout_(const String& aLocalRepositoryLockTimeoutEnvironmentVariableName
static Duration DefaultLocalRepositoryLockTimeout_(
const String& aLocalRepositoryLockTimeoutEnvironmentVariableName
);
};

Expand Down
5 changes: 3 additions & 2 deletions src/OpenSpaceToolkit/Physics/Coordinate/Velocity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@
return {coordinates_ * conversionFactor, aUnit, frameSPtr_};
}

Velocity Velocity::inFrame(const Position& aPosition, const Shared<const Frame>& aFrameSPtr, const Instant& anInstant)
const
Velocity Velocity::inFrame(

Check warning on line 121 in src/OpenSpaceToolkit/Physics/Coordinate/Velocity.cpp

View check run for this annotation

Codecov / codecov/patch

src/OpenSpaceToolkit/Physics/Coordinate/Velocity.cpp#L121 

Added line #L121 was not covered by tests
const Position& aPosition, const Shared<const Frame>& aFrameSPtr, const Instant& anInstant
) const
{
if ((aFrameSPtr == nullptr) || (!aFrameSPtr->isDefined()))
{
Expand Down
24 changes: 13 additions & 11 deletions src/OpenSpaceToolkit/Physics/Environment/Atmospheric/Earth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,17 +224,19 @@ Earth::Earth(
const Shared<Celestial>& aSunCelestialSPtr
)
: Model(),
implUPtr_(Earth::ImplFromType(
aType,
anInputDataType,
aF107ConstantValue,
aF107AConstantValue,
aKpConstantValue,
anEarthFrameSPtr,
anEarthRadius,
anEarthFlattening,
aSunCelestialSPtr
))
implUPtr_(
Earth::ImplFromType(
aType,
anInputDataType,
aF107ConstantValue,
aF107AConstantValue,
aKpConstantValue,
anEarthFrameSPtr,
anEarthRadius,
anEarthFlattening,
aSunCelestialSPtr
)
)
{
}

Expand Down
9 changes: 6 additions & 3 deletions src/OpenSpaceToolkit/Physics/Environment/Atmospheric/Earth/Exponential.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,12 @@ Tuple<Real, Real, Real> Exponential::DensityBandValues(const Length& anAltitude)

if (!bandIndex.isDefined())
{
throw ostk::core::error::RuntimeError(String::Format(
"Exponential density model is not valid for altitudes above 1000 km. Altitude = {}", anAltitude.toString()
));
throw ostk::core::error::RuntimeError(
String::Format(
"Exponential density model is not valid for altitudes above 1000 km. Altitude = {}",
anAltitude.toString()
)
);
}

// TBI: can cache the index bandIndex to avoid searching from the top of the list every time.
Expand Down
5 changes: 3 additions & 2 deletions src/OpenSpaceToolkit/Physics/Environment/Ephemeris/SPICE/Engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,9 @@ bool Engine::isKernelLoaded_(const Kernel& aKernel) const
return kernelSet_.find(aKernel) != kernelSet_.end();
}

Transform Engine::getTransformAt(const String& aSpiceIdentifier, const String& aFrameName, const Instant& anInstant)
const
Transform Engine::getTransformAt(
const String& aSpiceIdentifier, const String& aFrameName, const Instant& anInstant
) const
{
using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion;
using ostk::mathematics::geometry::d3::transformation::rotation::RotationMatrix;
Expand Down
14 changes: 8 additions & 6 deletions src/OpenSpaceToolkit/Physics/Environment/Gravitational/Earth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,14 @@ Earth::ExternalImpl::ExternalImpl(const Earth::ExternalImpl& anExternalImpl)
gravityModelDegree_(anExternalImpl.getDegree()),
gravityModelOrder_(anExternalImpl.getOrder()),
dataDirectory_(anExternalImpl.getDataDirectory()),
gravityModelUPtr_(Earth::ExternalImpl::GravityModelFromType(
anExternalImpl.getType(),
anExternalImpl.getDataDirectory(),
anExternalImpl.getDegree(),
anExternalImpl.getOrder()
))
gravityModelUPtr_(
Earth::ExternalImpl::GravityModelFromType(
anExternalImpl.getType(),
anExternalImpl.getDataDirectory(),
anExternalImpl.getDegree(),
anExternalImpl.getOrder()
)
)
{
}

Expand Down
40 changes: 25 additions & 15 deletions src/OpenSpaceToolkit/Physics/Environment/Object/Celestial/Earth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,39 +131,49 @@ Earth Earth::Default()

Earth Earth::EGM2008(const Integer& aGravityModelDegree, const Integer& aGravityModelOrder)
{
return Earth::GravitationalOnly(std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::EGM2008, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
));
return Earth::GravitationalOnly(
std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::EGM2008, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
)
);
}

Earth Earth::WGS84_EGM96(const Integer& aGravityModelDegree, const Integer& aGravityModelOrder)
{
return Earth::GravitationalOnly(std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::WGS84_EGM96, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
));
return Earth::GravitationalOnly(
std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::WGS84_EGM96, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
)
);
}

Earth Earth::EGM96(const Integer& aGravityModelDegree, const Integer& aGravityModelOrder)
{
const Shared<const Frame> earthFrameSPtr = Frame::ITRF();

return Earth::GravitationalOnly(std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::EGM96, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
));
return Earth::GravitationalOnly(
std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::EGM96, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
)
);
}

Earth Earth::EGM84(const Integer& aGravityModelDegree, const Integer& aGravityModelOrder)
{
return Earth::GravitationalOnly(std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::EGM84, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
));
return Earth::GravitationalOnly(
std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::EGM84, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
)
);
}

Earth Earth::WGS84(const Integer& aGravityModelDegree, const Integer& aGravityModelOrder)
{
return Earth::GravitationalOnly(std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::WGS84, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
));
return Earth::GravitationalOnly(
std::make_shared<EarthGravitationalModel>(
EarthGravitationalModel::Type::WGS84, Directory::Undefined(), aGravityModelDegree, aGravityModelOrder
)
);
}

Earth Earth::Spherical()
Expand Down
30 changes: 21 additions & 9 deletions src/OpenSpaceToolkit/Physics/Time/DateTime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,14 +405,22 @@ DateTime DateTime::Parse(const String& aString, const DateTime::Format& aFormat)
{
case DateTime::Format::Undefined: // Automatic format detection
{
if (aString.match(std::regex("^([-]?[0-9]+-[0-9]{2}-[0-9]{2})T([0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{1,9})?"
")(?:\\+[0-9]{4})?(?:Z)?$")))
if (aString.match(
std::regex(
"^([-]?[0-9]+-[0-9]{2}-[0-9]{2})T([0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{1,9})?"
")(?:\\+[0-9]{4})?(?:Z)?$"
)
))
{
return DateTime::Parse(aString, DateTime::Format::ISO8601);
}

if (aString.match(std::regex("^([\\d]{1,2} [\\w]{3} [\\d]{4}) "
"([0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{1,9})?)(?:\\+[0-9]{4})?(?:Z)?$")))
if (aString.match(
std::regex(
"^([\\d]{1,2} [\\w]{3} [\\d]{4}) "
"([0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{1,9})?)(?:\\+[0-9]{4})?(?:Z)?$"
)
))
{
return DateTime::Parse(aString, DateTime::Format::STK);
}
Expand All @@ -427,9 +435,11 @@ DateTime DateTime::Parse(const String& aString, const DateTime::Format& aFormat)
if (boost::regex_match(
aString,
match,
boost::regex("^([-]?[0-9]+-[0-9]{2}-[0-9]{2}) "
"([0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{1,3})?(?:\\.[0-9]{1,3})?(?:\\.[0-9]{1,3})?)?(?"
":\\+[0-9]{4})?(?:Z)?$")
boost::regex(
"^([-]?[0-9]+-[0-9]{2}-[0-9]{2}) "
"([0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{1,3})?(?:\\.[0-9]{1,3})?(?:\\.[0-9]{1,3})?)?(?"
":\\+[0-9]{4})?(?:Z)?$"
)
))
{
return DateTime(
Expand All @@ -450,8 +460,10 @@ DateTime DateTime::Parse(const String& aString, const DateTime::Format& aFormat)
if (boost::regex_match(
aString,
match,
boost::regex("^([-]?[0-9]+-[0-9]{2}-[0-9]{2})T([0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{1,9})?)?(?:\\+"
"[0-9]{4})?(?:Z)?$")
boost::regex(
"^([-]?[0-9]+-[0-9]{2}-[0-9]{2})T([0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{1,9})?)?(?:\\+"
"[0-9]{4})?(?:Z)?$"
)
))
{
return DateTime(
Expand Down
14 changes: 9 additions & 5 deletions src/OpenSpaceToolkit/Physics/Time/Duration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,9 +753,11 @@ Duration Duration::Parse(const String& aString, const Duration::Format& aFormat)
if (boost::regex_match(
aString,
match,
boost::regex("^([-])?(?:([0-9]+) "
")?(?:([0-9]{2}):)?(?:([0-9]{2}):)?([0-9]{2})(?:\\.([0-9]{3}))?(?:\\.([0-9]{3}))?(?:"
"\\.([0-9]{3}))?$")
boost::regex(
"^([-])?(?:([0-9]+) "
")?(?:([0-9]{2}):)?(?:([0-9]{2}):)?([0-9]{2})(?:\\.([0-9]{3}))?(?:\\.([0-9]{3}))?(?:"
"\\.([0-9]{3}))?$"
)
))
{
try
Expand Down Expand Up @@ -804,8 +806,10 @@ Duration Duration::Parse(const String& aString, const Duration::Format& aFormat)
if (boost::regex_match(
aString,
match,
boost::regex("^([-])?P(?:([0-9]+)D)?(?:T(?:([0-9]+)H)?(?:([0-9]+)M)?(?:(?:([0-9]+)(?:\\.([0-9]{1,9}"
"))?)S)?)?$")
boost::regex(
"^([-])?P(?:([0-9]+)D)?(?:T(?:([0-9]+)H)?(?:([0-9]+)M)?(?:(?:([0-9]+)(?:\\.([0-9]{1,9}"
"))?)S)?)?$"
)
)) // Does not support [M]onth and [Y]ear groups, allow [H]our, [M]inute and [S]econd carry over
{
try
Expand Down
Loading
Loading