Skip to content

Commit 1a822e2

Browse files
authored
Merge pull request #4270 from pleroy/MoveElementaryFunctions
Move elementary_functions.hpp and friends to numerics from quantities
2 parents edcce85 + c77da5e commit 1a822e2

177 files changed

Lines changed: 472 additions & 470 deletions

File tree

Some content is hidden

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

astronomy/lunar_eclipse_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
#include "gtest/gtest.h"
1010
#include "integrators/methods.hpp"
1111
#include "integrators/symmetric_linear_multistep_integrator.hpp"
12+
#include "numerics/elementary_functions.hpp"
1213
#include "numerics/root_finders.hpp"
1314
#include "physics/ephemeris.hpp"
1415
#include "physics/solar_system.hpp"
1516
#include "quantities/astronomy.hpp"
16-
#include "quantities/elementary_functions.hpp"
1717
#include "quantities/quantities.hpp"
1818
#include "quantities/si.hpp"
1919
#include "testing_utilities/approximate_quantity.hpp"
@@ -32,11 +32,11 @@ using namespace principia::geometry::_instant;
3232
using namespace principia::geometry::_sign;
3333
using namespace principia::integrators::_methods;
3434
using namespace principia::integrators::_symmetric_linear_multistep_integrator;
35+
using namespace principia::numerics::_elementary_functions;
3536
using namespace principia::numerics::_root_finders;
3637
using namespace principia::physics::_ephemeris;
3738
using namespace principia::physics::_solar_system;
3839
using namespace principia::quantities::_astronomy;
39-
using namespace principia::quantities::_elementary_functions;
4040
using namespace principia::quantities::_quantities;
4141
using namespace principia::quantities::_si;
4242
using namespace principia::testing_utilities::_approximate_quantity;

astronomy/lunar_orbit_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "integrators/symmetric_linear_multistep_integrator.hpp"
2222
#include "mathematica/logger.hpp"
2323
#include "mathematica/mathematica.hpp"
24+
#include "numerics/elementary_functions.hpp"
2425
#include "physics/apsides.hpp"
2526
#include "physics/body_surface_reference_frame.hpp"
2627
#include "physics/degrees_of_freedom.hpp"
@@ -31,7 +32,6 @@
3132
#include "physics/oblate_body.hpp"
3233
#include "physics/rigid_motion.hpp"
3334
#include "physics/solar_system.hpp"
34-
#include "quantities/elementary_functions.hpp"
3535
#include "quantities/named_quantities.hpp"
3636
#include "quantities/quantities.hpp"
3737
#include "quantities/si.hpp"
@@ -58,6 +58,7 @@ using namespace principia::integrators::_methods;
5858
using namespace principia::integrators::_symmetric_linear_multistep_integrator;
5959
using namespace principia::mathematica::_logger;
6060
using namespace principia::mathematica::_mathematica;
61+
using namespace principia::numerics::_elementary_functions;
6162
using namespace principia::physics::_apsides;
6263
using namespace principia::physics::_body_surface_reference_frame;
6364
using namespace principia::physics::_degrees_of_freedom;
@@ -68,7 +69,6 @@ using namespace principia::physics::_massless_body;
6869
using namespace principia::physics::_oblate_body;
6970
using namespace principia::physics::_rigid_motion;
7071
using namespace principia::physics::_solar_system;
71-
using namespace principia::quantities::_elementary_functions;
7272
using namespace principia::quantities::_named_quantities;
7373
using namespace principia::quantities::_quantities;
7474
using namespace principia::quantities::_si;

astronomy/orbit_analysis_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "mathematica/logger.hpp"
2222
#include "mathematica/mathematica.hpp"
2323
#include "numerics/angle_reduction.hpp"
24+
#include "numerics/elementary_functions.hpp"
2425
#include "numerics/polynomial_evaluators.hpp"
2526
#include "numerics/polynomial_in_monomial_basis.hpp"
2627
#include "physics/body_centred_non_rotating_reference_frame.hpp"
@@ -31,7 +32,6 @@
3132
#include "physics/rotating_body.hpp"
3233
#include "physics/solar_system.hpp"
3334
#include "quantities/astronomy.hpp"
34-
#include "quantities/elementary_functions.hpp"
3535
#include "quantities/quantities.hpp"
3636
#include "quantities/si.hpp"
3737
#include "testing_utilities/approximate_quantity.hpp"
@@ -62,6 +62,7 @@ using namespace principia::integrators::_symmetric_linear_multistep_integrator;
6262
using namespace principia::mathematica::_logger;
6363
using namespace principia::mathematica::_mathematica;
6464
using namespace principia::numerics::_angle_reduction;
65+
using namespace principia::numerics::_elementary_functions;
6566
using namespace principia::numerics::_polynomial_evaluators;
6667
using namespace principia::numerics::_polynomial_in_monomial_basis;
6768
using namespace principia::physics::_body_centred_non_rotating_reference_frame;
@@ -72,7 +73,6 @@ using namespace principia::physics::_massless_body;
7273
using namespace principia::physics::_rotating_body;
7374
using namespace principia::physics::_solar_system;
7475
using namespace principia::quantities::_astronomy;
75-
using namespace principia::quantities::_elementary_functions;
7676
using namespace principia::quantities::_quantities;
7777
using namespace principia::quantities::_si;
7878
using namespace principia::testing_utilities::_approximate_quantity;

astronomy/orbit_ground_track_body.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include "geometry/grassmann.hpp"
99
#include "geometry/space.hpp"
1010
#include "numerics/angle_reduction.hpp"
11+
#include "numerics/elementary_functions.hpp"
1112
#include "physics/apsides.hpp"
12-
#include "quantities/elementary_functions.hpp"
1313
#include "quantities/si.hpp"
1414

1515
namespace principia {
@@ -20,8 +20,8 @@ namespace internal {
2020
using namespace principia::geometry::_grassmann;
2121
using namespace principia::geometry::_space;
2222
using namespace principia::numerics::_angle_reduction;
23+
using namespace principia::numerics::_elementary_functions;
2324
using namespace principia::physics::_apsides;
24-
using namespace principia::quantities::_elementary_functions;
2525
using namespace principia::quantities::_si;
2626

2727
// Note that the origin of this celestial longitude is arbitrary: it is not the

astronomy/orbit_recurrence_body.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "base/mod.hpp"
1010
#include "base/status_utilities.hpp" // 🧙 For RETURN_IF_ERROR.
1111
#include "geometry/sign.hpp"
12-
#include "quantities/elementary_functions.hpp"
12+
#include "numerics/elementary_functions.hpp"
1313
#include "quantities/si.hpp"
1414

1515
namespace principia {
@@ -19,7 +19,7 @@ namespace internal {
1919

2020
using namespace principia::base::_mod;
2121
using namespace principia::geometry::_sign;
22-
using namespace principia::quantities::_elementary_functions;
22+
using namespace principia::numerics::_elementary_functions;
2323
using namespace principia::quantities::_si;
2424

2525
inline absl::StatusOr<int> SafeNearbyInt(double const x) {

astronomy/orbit_recurrence_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ using namespace principia::physics::_rotating_body;
2828
using namespace principia::physics::_solar_system;
2929
using namespace principia::quantities::_named_quantities;
3030
using namespace principia::quantities::_si;
31-
using namespace principia::testing_utilities::_numerics;
3231
using namespace principia::testing_utilities::_matchers;
32+
using namespace principia::testing_utilities::_numerics;
3333

3434
class OrbitRecurrenceTest : public ::testing::Test {
3535
protected:

astronomy/orbital_elements_body.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#include "integrators/methods.hpp"
1515
#include "integrators/ordinary_differential_equations.hpp"
1616
#include "numerics/angle_reduction.hpp"
17+
#include "numerics/elementary_functions.hpp"
1718
#include "numerics/quadrature.hpp"
1819
#include "physics/degrees_of_freedom.hpp"
1920
#include "physics/kepler_orbit.hpp"
20-
#include "quantities/elementary_functions.hpp"
2121
#include "quantities/si.hpp"
2222

2323
namespace principia {
@@ -31,10 +31,10 @@ using namespace principia::integrators::_integrators;
3131
using namespace principia::integrators::_methods;
3232
using namespace principia::integrators::_ordinary_differential_equations;
3333
using namespace principia::numerics::_angle_reduction;
34+
using namespace principia::numerics::_elementary_functions;
3435
using namespace principia::numerics::_quadrature;
3536
using namespace principia::physics::_degrees_of_freedom;
3637
using namespace principia::physics::_kepler_orbit;
37-
using namespace principia::quantities::_elementary_functions;
3838
using namespace principia::quantities::_si;
3939

4040
constexpr int osculating_equinoctial_elements_per_sidereal_period = 256;

astronomy/time_scales_body.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "astronomy/epoch.hpp"
1010
#include "glog/logging.h"
1111
#include "numerics/double_precision.hpp"
12-
#include "quantities/elementary_functions.hpp"
12+
#include "numerics/elementary_functions.hpp"
1313
#include "quantities/si.hpp"
1414

1515
namespace principia {
@@ -19,7 +19,7 @@ namespace internal {
1919

2020
using namespace principia::astronomy::_epoch;
2121
using namespace principia::numerics::_double_precision;
22-
using namespace principia::quantities::_elementary_functions;
22+
using namespace principia::numerics::_elementary_functions;
2323
using namespace principia::quantities::_si;
2424

2525
// Returns the duration between 2000-01-01T12:00:00 and `date_time` (of the same

astronomy/trappist_dynamics_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
#include "mathematica/logger.hpp"
3232
#include "mathematica/mathematica.hpp"
3333
#include "numerics/angle_reduction.hpp"
34+
#include "numerics/elementary_functions.hpp"
3435
#include "numerics/root_finders.hpp"
3536
#include "physics/degrees_of_freedom.hpp"
3637
#include "physics/ephemeris.hpp"
3738
#include "physics/kepler_orbit.hpp"
3839
#include "physics/massive_body.hpp"
3940
#include "physics/solar_system.hpp"
4041
#include "quantities/astronomy.hpp"
41-
#include "quantities/elementary_functions.hpp"
4242
#include "quantities/named_quantities.hpp"
4343
#include "quantities/quantities.hpp"
4444
#include "quantities/si.hpp"
@@ -66,14 +66,14 @@ using namespace principia::integrators::_symplectic_runge_kutta_nyström_integra
6666
using namespace principia::mathematica::_logger;
6767
using namespace principia::mathematica::_mathematica;
6868
using namespace principia::numerics::_angle_reduction;
69+
using namespace principia::numerics::_elementary_functions;
6970
using namespace principia::numerics::_root_finders;
7071
using namespace principia::physics::_degrees_of_freedom;
7172
using namespace principia::physics::_ephemeris;
7273
using namespace principia::physics::_kepler_orbit;
7374
using namespace principia::physics::_massive_body;
7475
using namespace principia::physics::_solar_system;
7576
using namespace principia::quantities::_astronomy;
76-
using namespace principia::quantities::_elementary_functions;
7777
using namespace principia::quantities::_named_quantities;
7878
using namespace principia::quantities::_quantities;
7979
using namespace principia::quantities::_si;

astronomy/лидов_古在_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
#include "gtest/gtest.h"
1616
#include "integrators/methods.hpp"
1717
#include "integrators/symmetric_linear_multistep_integrator.hpp"
18+
#include "numerics/elementary_functions.hpp"
1819
#include "physics/body_centred_non_rotating_reference_frame.hpp"
1920
#include "physics/discrete_trajectory.hpp"
2021
#include "physics/ephemeris.hpp"
2122
#include "physics/massive_body.hpp"
2223
#include "physics/massless_body.hpp"
2324
#include "physics/solar_system.hpp"
24-
#include "quantities/elementary_functions.hpp"
2525
#include "quantities/quantities.hpp"
2626
#include "quantities/si.hpp"
2727
#include "testing_utilities/approximate_quantity.hpp"
@@ -48,13 +48,13 @@ using namespace principia::geometry::_instant;
4848
using namespace principia::geometry::_interval;
4949
using namespace principia::integrators::_methods;
5050
using namespace principia::integrators::_symmetric_linear_multistep_integrator;
51+
using namespace principia::numerics::_elementary_functions;
5152
using namespace principia::physics::_body_centred_non_rotating_reference_frame;
5253
using namespace principia::physics::_discrete_trajectory;
5354
using namespace principia::physics::_ephemeris;
5455
using namespace principia::physics::_massive_body;
5556
using namespace principia::physics::_massless_body;
5657
using namespace principia::physics::_solar_system;
57-
using namespace principia::quantities::_elementary_functions;
5858
using namespace principia::quantities::_quantities;
5959
using namespace principia::quantities::_si;
6060
using namespace principia::testing_utilities::_approximate_quantity;

0 commit comments

Comments
 (0)