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: 7223b8fb9daf
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f7e65626bb6f
Choose a head ref
  • 4 commits
  • 19 files changed
  • 1 contributor

Commits on May 1, 2017

  1. SolarSystem constructor.

    @pleroy
    pleroy committed May 1, 2017
    Copy the full SHA
    8045e6f View commit details

  2. Fix tests.

    @pleroy
    pleroy committed May 1, 2017
    Copy the full SHA
    386aac1 View commit details

  3. Second constructor.

    @pleroy
    pleroy committed May 1, 2017
    Copy the full SHA
    9c2b079 View commit details

  4. Merge pull request #1353 from pleroy/SolarSystemCreation 

    Make it possible to construct a SolarSystem from protocol buffers
    @pleroy
    pleroy authored May 1, 2017
    Copy the full SHA
    f7e6562 View commit details
8 changes: 4 additions & 4 deletions astronomy/ksp_fingerprint_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ using KSP = Frame<serialization::Frame::TestTag,

class KSPFingerprintTest : public ::testing::Test {
protected:
KSPFingerprintTest() {
KSPFingerprintTest()
: solar_system_(
SOLUTION_DIR / "astronomy" / "kerbol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" / "kerbol_initial_state_0_0.proto.txt") {
google::LogToStderr();
solar_system_.Initialize(
SOLUTION_DIR / "astronomy" / "kerbol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" / "kerbol_initial_state_0_0.proto.txt");
}

SolarSystem<KSP> solar_system_;
9 changes: 4 additions & 5 deletions astronomy/ksp_resonance_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -71,14 +71,13 @@ class KSPResonanceTest : public ::testing::Test {

using Periods = std::map<not_null<MassiveBody const*>, Time>;

KSPResonanceTest() {
KSPResonanceTest()
: solar_system_(
SOLUTION_DIR / "astronomy" / "kerbol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" / "kerbol_initial_state_0_0.proto.txt") {
// This test is mostly a tool for investigating orbit stability, so we want
// logging.
google::LogToStderr();

solar_system_.Initialize(
SOLUTION_DIR / "astronomy" / "kerbol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" / "kerbol_initial_state_0_0.proto.txt");
}

not_null<std::unique_ptr<Ephemeris<KSP>>> MakeEphemeris() {
8 changes: 4 additions & 4 deletions astronomy/ksp_system_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -67,10 +67,10 @@ using KSP = Frame<serialization::Frame::TestTag,

class KSPSystem {
protected:
KSPSystem() {
solar_system_.Initialize(
SOLUTION_DIR / "astronomy" / "kerbol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" / "kerbol_initial_state_0_0.proto.txt");
KSPSystem()
: solar_system_(
SOLUTION_DIR / "astronomy" / "kerbol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" / "kerbol_initial_state_0_0.proto.txt") {
StabilizeKSP(solar_system_);
}

9 changes: 4 additions & 5 deletions astronomy/lunar_eclipse_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -59,10 +59,6 @@ class LunarEclipseTest : public ::testing::Test {
protected:
static void SetUpTestCase() {
google::LogToStderr();
solar_system_1950_.Initialize(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2433282_500000000.proto.txt");
ephemeris_ = solar_system_1950_.MakeEphemeris(
/*fitting_tolerance=*/5 * Milli(Metre),
Ephemeris<ICRFJ2000Equator>::FixedStepParameters(
@@ -223,7 +219,10 @@ class LunarEclipseTest : public ::testing::Test {
static Length atmospheric_depth_;
};

SolarSystem<ICRFJ2000Equator> LunarEclipseTest::solar_system_1950_;
SolarSystem<ICRFJ2000Equator> LunarEclipseTest::solar_system_1950_(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2433282_500000000.proto.txt");
std::unique_ptr<Ephemeris<ICRFJ2000Equator>> LunarEclipseTest::ephemeris_;
Length LunarEclipseTest::r_sun_;
Length LunarEclipseTest::r_earth_;
9 changes: 4 additions & 5 deletions astronomy/mercury_perihelion_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -58,10 +58,6 @@ class MercuryPerihelionTest : public testing::Test {
protected:
static void SetUpTestCase() {
google::LogToStderr();
solar_system_1950_.Initialize(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2433282_500000000.proto.txt");
ephemeris_ = solar_system_1950_.MakeEphemeris(
/*fitting_tolerance=*/5 * Milli(Metre),
Ephemeris<ICRFJ2000Equator>::FixedStepParameters(
@@ -125,7 +121,10 @@ class MercuryPerihelionTest : public testing::Test {
KeplerianElements<ICRFJ2000Equator> keplerian_elements_2050_;
};

SolarSystem<ICRFJ2000Equator> MercuryPerihelionTest::solar_system_1950_;
SolarSystem<ICRFJ2000Equator> MercuryPerihelionTest::solar_system_1950_(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2433282_500000000.proto.txt");
std::unique_ptr<Ephemeris<ICRFJ2000Equator>> MercuryPerihelionTest::ephemeris_;

TEST_F(MercuryPerihelionTest, Year1950) {
12 changes: 4 additions & 8 deletions astronomy/solar_system_dynamics_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -264,14 +264,12 @@ class SolarSystemDynamicsTest : public testing::Test {

// This takes a minute to run.
TEST_F(SolarSystemDynamicsTest, DISABLED_TenYearsFromJ2000) {
SolarSystem<ICRFJ2000Equator> solar_system_at_j2000;
solar_system_at_j2000.Initialize(
SolarSystem<ICRFJ2000Equator> solar_system_at_j2000(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2451545_000000000.proto.txt");

SolarSystem<ICRFJ2000Equator> ten_years_later;
ten_years_later.Initialize(
SolarSystem<ICRFJ2000Equator> ten_years_later(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2455200_500000000.proto.txt");
@@ -389,8 +387,7 @@ TEST_F(SolarSystemDynamicsTest, DISABLED_TenYearsFromJ2000) {
// This test produces the file phobos.generated.wl which is consumed by the
// notebook phobos.nb.
TEST(MarsTest, Phobos) {
SolarSystem<ICRFJ2000Equator> solar_system_at_j2000;
solar_system_at_j2000.Initialize(
SolarSystem<ICRFJ2000Equator> solar_system_at_j2000(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2451545_000000000.proto.txt");
@@ -480,8 +477,7 @@ TEST_P(SolarSystemDynamicsConvergenceTest, DISABLED_Convergence) {
google::LogToStderr();
Time const integration_duration = 1 * JulianYear;

SolarSystem<ICRFJ2000Equator> solar_system_at_j2000;
solar_system_at_j2000.Initialize(
SolarSystem<ICRFJ2000Equator> solar_system_at_j2000(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2451545_000000000.proto.txt");
9 changes: 4 additions & 5 deletions astronomy/молния_orbit_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -67,10 +67,6 @@ class МолнияOrbitTest : public ::testing::Test {
protected:
static void SetUpTestCase() {
google::LogToStderr();
solar_system_2000_.Initialize(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2451545_000000000.proto.txt");
ephemeris_ = solar_system_2000_.MakeEphemeris(
/*fitting_tolerance=*/5 * Milli(Metre),
Ephemeris<ICRFJ2000Equator>::FixedStepParameters(
@@ -82,7 +78,10 @@ class МолнияOrbitTest : public ::testing::Test {
static std::unique_ptr<Ephemeris<ICRFJ2000Equator>> ephemeris_;
};

SolarSystem<ICRFJ2000Equator> МолнияOrbitTest::solar_system_2000_;
SolarSystem<ICRFJ2000Equator> МолнияOrbitTest::solar_system_2000_(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2451545_000000000.proto.txt");
std::unique_ptr<Ephemeris<ICRFJ2000Equator>> МолнияOrbitTest::ephemeris_;

#if !defined(_DEBUG)
6 changes: 2 additions & 4 deletions benchmarks/dynamic_frame.cpp
View file
Original file line number Diff line number Diff line change
@@ -127,8 +127,7 @@ void BM_BodyCentredNonRotatingDynamicFrame(benchmark::State& state) {
Time const Δt = 5 * Minute;
int const steps = state.range_x();

SolarSystem<ICRFJ2000Equator> solar_system;
solar_system.Initialize(
SolarSystem<ICRFJ2000Equator> solar_system(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2433282_500000000.proto.txt");
@@ -175,8 +174,7 @@ void BM_BarycentricRotatingDynamicFrame(benchmark::State& state) {
Time const Δt = 5 * Minute;
int const steps = state.range_x();

SolarSystem<ICRFJ2000Equator> solar_system;
solar_system.Initialize(
SolarSystem<ICRFJ2000Equator> solar_system(
SOLUTION_DIR / "astronomy" / "sol_gravity_model.proto.txt",
SOLUTION_DIR / "astronomy" /
"sol_initial_state_jd_2433282_500000000.proto.txt");
Loading