Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Zermelo is हरीश चंद्र #3292

Merged
merged 2 commits into from
Jan 21, 2022
Merged

Zermelo is हरीश चंद्र #3292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e44fc79
Zermelo is हरीश चंद्र.
pleroy Jan 21, 2022
a2f7479
Remove failed attempt.
pleroy Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ksp_plugin/vessel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,14 +609,14 @@ not_null<std::unique_ptr<Vessel>> Vessel::ReadFromMessage(
bool const is_pre_陈景润 = !message.history().has_downsampling() &&
message.history().segment_size() == 0;
bool const is_pre_hamilton = message.history().segment_size() == 0;
bool const is_pre_zermelo = !message.has_is_collapsible();
LOG_IF(WARNING, is_pre_zermelo)
bool const is_pre_हरीश_चंद्र = !message.has_is_collapsible();
LOG_IF(WARNING, is_pre_हरीश_चंद्र)
<< "Reading pre-"
<< (is_pre_cesàro ? u8"Cesàro"
: is_pre_chasles ? "Chasles"
: is_pre_陈景润 ? u8"陈景润"
: is_pre_hamilton ? "Hamilton"
: "Zermelo") << " Vessel";
: u8"हरीश चंद्र") << " Vessel";

// NOTE(egg): for now we do not read the |MasslessBody| as it can contain no
// information.
Expand Down Expand Up @@ -679,7 +679,7 @@ not_null<std::unique_ptr<Vessel>> Vessel::ReadFromMessage(
vessel->backstory_ = vessel->trajectory_.segments().begin();
CHECK(vessel->backstory_ == std::prev(vessel->psychohistory_));
vessel->downsampling_parameters_ = DefaultDownsamplingParameters();
} else if (is_pre_zermelo) {
} else if (is_pre_हरीश_चंद्र) {
DiscreteTrajectorySegmentIterator<Barycentric> history;
vessel->trajectory_ = DiscreteTrajectory<Barycentric>::ReadFromMessage(
message.history(),
Expand Down
2 changes: 1 addition & 1 deletion ksp_plugin/vessel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class Vessel {

mutable absl::Mutex lock_;

// When reading a pre-Zermelo save, the existing history must be
// When reading a pre-हरीश चंद्र save, the existing history must be
// non-collapsible as we don't know anything about it.
bool is_collapsible_ = false;

Expand Down
9 changes: 3 additions & 6 deletions serialization/ksp_plugin.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@ message Vessel {
optional bool psychohistory_is_authoritative = 17; // Pre-Cesàro.
optional DiscreteTrajectory prediction = 18; // Pre-Chasles.
optional FlightPlan flight_plan = 4;
optional bool is_collapsible = 22; // Added in Zermelo.
repeated Checkpoint checkpoint = 21; // Added in Zermelo.
optional bool is_collapsible = 22; // Added in हरीश चंद्र.
repeated Checkpoint checkpoint = 21; // Added in हरीश चंद्र.
optional DiscreteTrajectorySegment.DownsamplingParameters
downsampling_parameters = 23; // Added in Zermelo.
downsampling_parameters = 23; // Added in हरीश चंद्र.

// Pre-Буняковский.
reserved 2, 3, 5;
Expand All @@ -195,7 +195,4 @@ message Vessel {
"prediction_fork_time";
// Pre-Cesàro.
reserved "psychohistory";
// Zermelo failed attempt.
reserved 20;
reserved "prehistory";
}