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: 993d6a2214a5
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 26d7cd971bbb
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on May 20, 2017

  1. Reorder parameters in dynamic frame deserialization.

    @pleroy
    pleroy committed May 20, 2017
    Copy the full SHA
    ae8b380 View commit details

  2. Merge pull request #1387 from pleroy/Parameters 

    Reorder parameters in dynamic frame deserialization
    @pleroy
    pleroy authored May 20, 2017
    Copy the full SHA
    26d7cd9 View commit details
2 changes: 1 addition & 1 deletion ksp_plugin/manœuvre_body.hpp
View file
Original file line number Diff line number Diff line change
@@ -209,7 +209,7 @@ Manœuvre<InertialFrame, Frame> Manœuvre<InertialFrame, Frame>::ReadFromMessage
SpecificImpulse::ReadFromMessage(message.specific_impulse()),
Vector<double, Frenet<Frame>>::ReadFromMessage(message.direction()),
DynamicFrame<InertialFrame, Frame>::ReadFromMessage(
ephemeris, message.frame()));
message.frame(), ephemeris));
manœuvre.set_duration(Time::ReadFromMessage(message.duration()));
manœuvre.set_initial_time(Instant::ReadFromMessage(message.initial_time()));
return manœuvre;
4 changes: 2 additions & 2 deletions ksp_plugin/plugin.cpp
View file
Original file line number Diff line number Diff line change
@@ -1169,8 +1169,8 @@ not_null<std::unique_ptr<Plugin>> Plugin::ReadFromMessage(
plugin->UpdatePlanetariumRotation();

std::unique_ptr<NavigationFrame> plotting_frame =
NavigationFrame::ReadFromMessage(plugin->ephemeris_.get(),
message.plotting_frame());
NavigationFrame::ReadFromMessage(message.plotting_frame(),
plugin->ephemeris_.get());
plugin->SetPlottingFrame(std::move(plotting_frame));

// Note that for proper deserialization of parts this list must be
2 changes: 1 addition & 1 deletion physics/barycentric_rotating_dynamic_frame_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -504,7 +504,7 @@ TEST_F(BarycentricRotatingDynamicFrameTest, Serialization) {

auto const read_big_small_frame =
DynamicFrame<ICRFJ2000Equator, BigSmallFrame>::ReadFromMessage(
ephemeris_.get(), message);
message, ephemeris_.get());
EXPECT_THAT(read_big_small_frame, Not(IsNull()));

Instant const t = t0_ + period_;
2 changes: 1 addition & 1 deletion physics/body_centred_body_direction_dynamic_frame_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -450,7 +450,7 @@ TEST_F(BodyCentredBodyDirectionDynamicFrameTest, Serialization) {

auto const read_big_small_frame =
DynamicFrame<ICRFJ2000Equator, BigSmallFrame>::ReadFromMessage(
ephemeris_.get(), message);
message, ephemeris_.get());
EXPECT_THAT(read_big_small_frame, Not(IsNull()));

Instant const t = t0_ + period_;
2 changes: 1 addition & 1 deletion physics/body_centred_non_rotating_dynamic_frame_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -205,7 +205,7 @@ TEST_F(BodyCentredNonRotatingDynamicFrameTest, Serialization) {

auto const read_small_frame =
DynamicFrame<ICRFJ2000Equator, Small>::ReadFromMessage(
ephemeris_.get(), message);
message, ephemeris_.get());
EXPECT_THAT(read_small_frame, Not(IsNull()));

Instant const t = t0_ + period_;
2 changes: 1 addition & 1 deletion physics/body_surface_dynamic_frame_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -353,7 +353,7 @@ TEST_F(BodySurfaceDynamicFrameTest, Serialization) {

auto const read_big_frame =
DynamicFrame<ICRFJ2000Equator, BigSmallFrame>::ReadFromMessage(
ephemeris_.get(), message);
message, ephemeris_.get());
EXPECT_THAT(read_big_frame, Not(IsNull()));

Instant const t = t0_ + period_;
4 changes: 2 additions & 2 deletions physics/dynamic_frame.hpp
View file
Original file line number Diff line number Diff line change
@@ -63,8 +63,8 @@ class DynamicFrame {
// Dispatches to one of the subclasses depending on the contents of the
// message.
static not_null<std::unique_ptr<DynamicFrame>>
ReadFromMessage(not_null<Ephemeris<InertialFrame> const*> ephemeris,
serialization::DynamicFrame const& message);
ReadFromMessage(serialization::DynamicFrame const& message,
not_null<Ephemeris<InertialFrame> const*> ephemeris);

private:
virtual Vector<Acceleration, InertialFrame> GravitationalAcceleration(
4 changes: 2 additions & 2 deletions physics/dynamic_frame_body.hpp
View file
Original file line number Diff line number Diff line change
@@ -104,8 +104,8 @@ DynamicFrame<InertialFrame, ThisFrame>::FrenetFrame(
template<typename InertialFrame, typename ThisFrame>
not_null<std::unique_ptr<DynamicFrame<InertialFrame, ThisFrame>>>
DynamicFrame<InertialFrame, ThisFrame>::ReadFromMessage(
not_null<Ephemeris<InertialFrame> const*> const ephemeris,
serialization::DynamicFrame const& message) {
serialization::DynamicFrame const& message,
not_null<Ephemeris<InertialFrame> const*> const ephemeris) {
std::unique_ptr<DynamicFrame> result;
int extensions_found = 0;
// NOTE(egg): the |static_cast|ing below is needed on MSVC, because the silly