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: 72e829f22d5b
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ae77ba9698ff
Choose a head ref
  • 3 commits
  • 9 files changed
  • 2 contributors

Commits on Oct 22, 2021

  1. Rename DiscreteTrajectory2 into DiscreteTraject0ry to avoid having to…

    … reformat the clients due to the different length of the identifiers.
    pleroy committed Oct 22, 2021
    Copy the full SHA
    ebd30f7 View commit details
  2. Merge.

    pleroy committed Oct 22, 2021
    Copy the full SHA
    b4b5152 View commit details
  3. Merge pull request #3161 from pleroy/Leet

    Rename DiscreteTrajectory2 into DiscreteTraject0ry
    eggrobin authored Oct 22, 2021
    Copy the full SHA
    ae77ba9 View commit details
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ FORWARD_DECLARE_FROM(discrete_trajectory_segment,
TEMPLATE(typename Frame) class,
DiscreteTrajectorySegment);

namespace internal_discrete_trajectory2 {
namespace internal_discrete_traject0ry {

using base::not_null;
using base::uninitialized_t;
@@ -37,7 +37,7 @@ using geometry::Velocity;
using physics::DegreesOfFreedom;

template<typename Frame>
class DiscreteTrajectory2 : public Trajectory<Frame> {
class DiscreteTraject0ry : public Trajectory<Frame> {
public:
using key_type =
typename internal_discrete_trajectory_types::Timeline<Frame>::key_type;
@@ -52,13 +52,13 @@ class DiscreteTrajectory2 : public Trajectory<Frame> {
using ReverseSegmentRange =
DiscreteTrajectorySegmentRange<ReverseSegmentIterator>;

DiscreteTrajectory2();
DiscreteTraject0ry();

// Moveable.
DiscreteTrajectory2(DiscreteTrajectory2&&) = default;
DiscreteTrajectory2& operator=(DiscreteTrajectory2&&) = default;
DiscreteTrajectory2(const DiscreteTrajectory2&) = delete;
DiscreteTrajectory2& operator=(const DiscreteTrajectory2&) = delete;
DiscreteTraject0ry(DiscreteTraject0ry&&) = default;
DiscreteTraject0ry& operator=(DiscreteTraject0ry&&) = default;
DiscreteTraject0ry(const DiscreteTraject0ry&) = delete;
DiscreteTraject0ry& operator=(const DiscreteTraject0ry&) = delete;

iterator begin() const;
iterator end() const;
@@ -80,8 +80,8 @@ class DiscreteTrajectory2 : public Trajectory<Frame> {

SegmentIterator NewSegment();

DiscreteTrajectory2 DetachSegments(SegmentIterator begin);
SegmentIterator AttachSegments(DiscreteTrajectory2&& trajectory);
DiscreteTraject0ry DetachSegments(SegmentIterator begin);
SegmentIterator AttachSegments(DiscreteTraject0ry&& trajectory);
void DeleteSegments(SegmentIterator begin);

void ForgetAfter(Instant const& t);
@@ -104,7 +104,7 @@ class DiscreteTrajectory2 : public Trajectory<Frame> {
std::vector<iterator> const& exact) const;
template<typename F = Frame,
typename = std::enable_if_t<base::is_serializable_v<F>>>
static DiscreteTrajectory2 ReadFromMessage(
static DiscreteTraject0ry ReadFromMessage(
serialization::DiscreteTrajectory const& message,
std::vector<SegmentIterator*> const& tracked);

@@ -115,7 +115,7 @@ class DiscreteTrajectory2 : public Trajectory<Frame> {

// This constructor leaves the list of segments empty (but allocated) as well
// as the time-to-segment mapping.
explicit DiscreteTrajectory2(uninitialized_t);
explicit DiscreteTraject0ry(uninitialized_t);

typename Segments::iterator FindSegment(Instant const& t);
typename Segments::const_iterator FindSegment(Instant const& t) const;
@@ -128,8 +128,8 @@ class DiscreteTrajectory2 : public Trajectory<Frame> {
// segments have been spliced from |from| to |to|. The iterators indicate the
// segments to fix-up.
static void AdjustAfterSplicing(
DiscreteTrajectory2& from,
DiscreteTrajectory2& to,
DiscreteTraject0ry& from,
DiscreteTraject0ry& to,
typename Segments::iterator to_segments_begin,
std::reverse_iterator<typename Segments::iterator> to_segments_rend);

@@ -148,15 +148,15 @@ class DiscreteTrajectory2 : public Trajectory<Frame> {
serialization::DiscreteTrajectory::Brood const& message,
std::vector<SegmentIterator*> const& tracked,
value_type const& fork_point,
DiscreteTrajectory2& trajectory);
DiscreteTraject0ry& trajectory);

// Reads a pre-Ζήνων trajectory, updating the tracked segments as needed. If
// this is not the root of the trajectory, fork_point is set.
static void ReadFromPreΖήνωνMessage(
serialization::DiscreteTrajectory const& message,
std::vector<SegmentIterator*> const& tracked,
std::optional<value_type> const& fork_point,
DiscreteTrajectory2& trajectory);
DiscreteTraject0ry& trajectory);

// We need a level of indirection here to make sure that the pointer to
// Segments in the DiscreteTrajectorySegmentIterator remain valid when the
@@ -172,11 +172,11 @@ class DiscreteTrajectory2 : public Trajectory<Frame> {
typename Segments::iterator> segment_by_left_endpoint_;
};

} // namespace internal_discrete_trajectory2
} // namespace internal_discrete_traject0ry

using internal_discrete_trajectory2::DiscreteTrajectory2;
using internal_discrete_traject0ry::DiscreteTraject0ry;

} // namespace physics
} // namespace principia

#include "physics/discrete_trajectory2_body.hpp"
#include "physics/discrete_traject0ry_body.hpp"
Loading