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

Rename DiscreteTrajectory2 into DiscreteTraject0ry #3161

Merged
merged 2 commits into from
Oct 22, 2021
Merged

Rename DiscreteTrajectory2 into DiscreteTraject0ry #3161

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
ebd30f7
Rename DiscreteTrajectory2 into DiscreteTraject0ry to avoid having to…
pleroy Oct 22, 2021
b4b5152
Merge.
pleroy Oct 22, 2021
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
36 changes: 18 additions & 18 deletions physics/discrete_trajectory2.hpp → physics/discrete_traject0ry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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);
Expand All @@ -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);

Expand All @@ -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;
Expand All @@ -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);

Expand All @@ -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
Expand All @@ -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