Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f782e40796d8
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7475dd5fcbbc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 20, 2020

  1. Revert "Revert "designated initializers""

    This reverts commit 69c2c3d.
    eggrobin committed Nov 20, 2020
    Copy the full SHA
    57dc482 View commit details

Commits on Nov 21, 2020

  1. Merge pull request #2789 from eggrobin/c++20

    Bring back some designated initializers
    eggrobin authored Nov 21, 2020
    Copy the full SHA
    7475dd5 View commit details
Showing with 18 additions and 18 deletions.
  1. +18 −18 astronomy/orbital_elements_body.hpp
36 changes: 18 additions & 18 deletions astronomy/orbital_elements_body.hpp
Original file line number Diff line number Diff line change
@@ -150,15 +150,15 @@ OrbitalElements::OsculatingEquinoctialElements(
double const tg_½i = Tan(i / 2);
double const cotg_½i = 1 / tg_½i;
result.push_back(
{/*.t = */ time,
/*.a = */ *osculating_elements.semimajor_axis,
/*.h = */ e * Sin(ϖ),
/*.k = */ e * Cos(ϖ),
/*.λ = */ result.empty() ? ϖ + M : UnwindFrom(result.back().λ, ϖ + M),
/*.p = */ tg_½i * Sin(Ω),
/*.q = */ tg_½i * Cos(Ω),
/*.pʹ = */ cotg_½i * Sin(Ω),
/*.qʹ = */ cotg_½i * Cos(Ω)});
{.t = time,
.a = *osculating_elements.semimajor_axis,
.h = e * Sin(ϖ),
.k = e * Cos(ϖ),
.λ = result.empty() ? ϖ + M : UnwindFrom(result.back().λ, ϖ + M),
.p = tg_½i * Sin(Ω),
.q = tg_½i * Cos(Ω),
.pʹ = cotg_½i * Sin(Ω),
.qʹ = cotg_½i * Cos(Ω)});
}
return result;
}
@@ -335,22 +335,22 @@ OrbitalElements::ToClassicalElements(
Angle const ω = ϖ - Ω;
Angle const M = equinoctial.λ - ϖ;
classical_elements.push_back(
{/*.time = */ equinoctial.t,
/*.semimajor_axis = */ equinoctial.a,
/*.eccentricity = */ e,
/*.inclination = */ i,
/*.longitude_of_ascending_node = */ classical_elements.empty()
{.time = equinoctial.t,
.semimajor_axis = equinoctial.a,
.eccentricity = e,
.inclination = i,
.longitude_of_ascending_node = classical_elements.empty()
? Mod(Ω, 2 * π * Radian)
: UnwindFrom(classical_elements.back().longitude_of_ascending_node,
Ω),
/*.argument_of_periapsis = */ classical_elements.empty()
.argument_of_periapsis = classical_elements.empty()
? Mod(ω, 2 * π * Radian)
: UnwindFrom(classical_elements.back().argument_of_periapsis, ω),
/*.mean_anomaly = */ classical_elements.empty()
.mean_anomaly = classical_elements.empty()
? Mod(M, 2 * π * Radian)
: UnwindFrom(classical_elements.back().mean_anomaly, M),
/*.periapsis_distance = */ (1 - e) * equinoctial.a,
/*.apoapsis_distance = */ (1 + e) * equinoctial.a});
.periapsis_distance = (1 - e) * equinoctial.a,
.apoapsis_distance = (1 + e) * equinoctial.a});
}
return classical_elements;
}