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

Commits on Aug 25, 2020

  1. Debugging the save.

    pleroy committed Aug 25, 2020
    Copy the full SHA
    b31379d View commit details

Commits on Sep 5, 2020

  1. Copy the full SHA
    77dd077 View commit details
  2. Copy the full SHA
    1f47ee3 View commit details
  3. Remove traces.

    pleroy committed Sep 5, 2020
    Copy the full SHA
    b453a24 View commit details
  4. Merge pull request #2709 from pleroy/2685

    Don't save the prediction as it may require unreasonable prolongation of the ephemeris
    pleroy authored Sep 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    87a5554 View commit details
Showing with 11 additions and 4 deletions.
  1. +7 −1 ksp_plugin/vessel.cpp
  2. +4 −3 ksp_plugin_test/interface_test.cpp
8 changes: 7 additions & 1 deletion ksp_plugin/vessel.cpp
Original file line number Diff line number Diff line change
@@ -400,8 +400,14 @@ void Vessel::WriteToMessage(not_null<serialization::Vessel*> const message,
CHECK(Contains(parts_, part_id));
message->add_kept_parts(part_id);
}
// Starting with Gateaux we don't save the prediction, see #2685. Instead we
// save an empty prediction that we re-read as a prediction. This is a bit
// hacky, but hopefully we can remove this hack once #2400 is solved.
DiscreteTrajectory<Barycentric>* empty_prediction =
psychohistory_->NewForkAtLast();
history_->WriteToMessage(message->mutable_history(),
/*forks=*/{psychohistory_, prediction_});
/*forks=*/{psychohistory_, empty_prediction});
psychohistory_->DeleteFork(empty_prediction);
if (flight_plan_ != nullptr) {
flight_plan_->WriteToMessage(message->mutable_flight_plan());
}
7 changes: 4 additions & 3 deletions ksp_plugin_test/interface_test.cpp
Original file line number Diff line number Diff line change
@@ -675,16 +675,17 @@ TEST_F(InterfaceTest, DISABLED_SECULAR_DeserializePluginDebug) {
{
PushDeserializer* deserializer = nullptr;
auto const lines = ReadLinesFromBase64File(
R"(P:\Public Mockingbird\Principia\Crashes\2400\0 1958.sfs)");
R"(P:\Public Mockingbird\Principia\Saves\2685\five-minute-scene-change-neptune.txt)");
LOG(ERROR) << "Deserialization starting";
int i = 0;
for (std::string const& line : lines) {
principia__DeserializePlugin(line.c_str(),
&deserializer,
&plugin,
/*compressor=*/"gipfeli",
"base64");
}
principia__DeserializePlugin(lines.front().c_str(),
principia__DeserializePlugin("",
&deserializer,
&plugin,
/*compressor=*/"gipfeli",
@@ -723,7 +724,7 @@ TEST_F(InterfaceTest, DISABLED_SECULAR_DeserializePluginDebug) {
/*compressor=*/"gipfeli",
"base64");
}
principia__DeserializePlugin(lines.front().c_str(),
principia__DeserializePlugin("",
&deserializer,
&plugin,
/*compressor=*/"gipfeli",