mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-20 20:54:59 +01:00
feat(ai): PointVelocity, a speed limit for the head of the train at a point beyond the cell (#304)
* feat(ai): PointVelocity, a speed limit for the head of the train at a point beyond the cell A memory cell (or putvalues) with "PointVelocity v d" tells the train that the head has to be at v km/h at the point d metres beyond the cell (v -1: no limit). The cell is read by the speed table scan like a signal, live until the head passes it; what it says then is kept for the point, later changes of the cell don't concern that train. The limit ends when the head passes the point, it doesn't hold the rest of the train and doesn't extend or break a speed limit of the line, like W27 of length 0 moved d metres on. The AI brakes so the head reaches the point at v; for a human driver it only shows as the next speed limit of the driving aid, the security systems don't see it. It is made for the warning disc of a level crossing (TOP, Osp1/Osp2), which has to give 20 km/h at the crossing about 500 m beyond the disc, as the disc showed when the train passed it. The cell with PointVelocity as its first command makes its getvalues scanned (passive) as SetVelocity does; PutCommand ignores it when such an event runs. Old commands keep working as they did, SetProximityVelocity included. * fix(ai): a point limit isn't a signal, and a PointVelocity 0 can be released From the review of the PointVelocity commit: - a cell rewritten from SetVelocity or ShuntVelocity to PointVelocity drops the flags of a signal, so it can't count as a semaphor or report a signal passed at danger; - PointVelocity 0 is read on after the head passes the cell, as a stop of a signal is, otherwise the train would stand short of the point for good; - a point limit doesn't become eSignNext, so a W4 between the disc and the crossing keeps its release. * fix(ai): a PointVelocity limit outlives a rebuilt speed table, and holds when shunting The state of the cell, latched when the head passes it, is now kept by the controller apart from the speed table, and the distance to the point is measured by the movement of the consist in the world. Stopping, backing up and going on between the cell and the point, coupling or a takeover no longer lose the limit or read the cell anew, unless the head backs up past the cell, when the cell is read again. Near the point the desired speed is capped to the limit, so a train that coasts within its tolerance (as a shunting one does) reaches the point at it. * fix(ai): review of the latched point limits - a point the head has passed already isn't latched, and a latched limit at or behind the head isn't applied (it asked for a full brake for a cycle); - a latched limit is dropped once the head backs up behind its cell, so it can't follow the consist onto another track; the table reads the cell again; - a cell latched already, found under the consist by a rebuilt table, is ignored whatever it shows now (a 0 for the next train no longer stops it); - PointVelocity 0 stops at the usual distance, not from the approach; - the heading follows the track under the measured vehicle, not the chord of the consist, which a long consist on a tight curve holds far off the track; - vehicles coupled or uncoupled at the end towards the point move the head; - a jump of the consist (moved elsewhere) drops the latched limits. * fix(ai): a cab change and curves don't move the latched point limits - the end of the consist towards the point is taken into the distance only when the consist changes (its end vehicles or its length), not when another vehicle is measured from (a cab change at a reversal) nor when a curve shortens its projection; - the way of travel follows the direction of the driver's vehicle against its own couplers, not the chord of the consist, which on a balloon loop points against it. * fix(ai): a coupling with a cab change in one order still moves the head of a latched point limit The end of the consist measured from the previous vehicle is moved to the place of the new one, so a coupling or an uncoupling followed at once by a change of direction to the other cab (the shunting orders) is taken into the distance to the point. --------- Co-authored-by: maj00r <maj00r@host>
This commit is contained in:
@@ -145,7 +145,8 @@ enum TSpeedPosFlag
|
||||
spSemaphor = 0x4000, // semafor pociągowy
|
||||
spRoadVel = 0x8000, // zadanie prędkości drogowej
|
||||
spSectionVel = 0x20000, // odcinek z ograniczeniem
|
||||
spProximityVelocity = 0x40000 // odcinek z ograniczeniem i podaną jego długościa
|
||||
spProximityVelocity = 0x40000, // odcinek z ograniczeniem i podaną jego długościa
|
||||
spPointVelocity = 0x80000 // ograniczenie dla czoła w punkcie fPointDist za wpisem (PointVelocity)
|
||||
// spDontApplySpeedLimit = 0x10000 // this point won't apply its speed limit. potentially set by the scanning vehicle
|
||||
};
|
||||
|
||||
@@ -155,6 +156,7 @@ class TSpeedPos
|
||||
double fDist{ 0.0 }; // aktualna odległość (ujemna gdy minięte)
|
||||
double fVelNext{ -1.0 }; // prędkość obowiązująca od tego miejsca
|
||||
double fSectionVelocityDist{ 0.0 }; // długość ograniczenia prędkości
|
||||
double fPointDist{ 0.0 }; // PointVelocity: o ile dalej od wpisu leży punkt, w którym czoło ma mieć fVelNext
|
||||
int iFlags{ spNone }; // flagi typu wpisu do tabelki
|
||||
bool bMoved{ false }; // czy przesunięty (dotyczy punktu zatrzymania w peronie)
|
||||
double fMoved{ 0.0 }; // ile przesunięty (dotyczy punktu zatrzymania w peronie)
|
||||
@@ -553,6 +555,20 @@ private:
|
||||
TCommandType TableUpdate( double &fVelDes, double &fDist, double &fNext, double &fAcc );
|
||||
bool TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, double const Signaldistance );
|
||||
bool TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPos &Point, double &Signaldistance, int const Pointindex );
|
||||
// keeps the PointVelocity limit of a speed table entry whose cell the head has just passed
|
||||
void latch_point_limit( TSpeedPos const &Point );
|
||||
// moves the latched point limits by the movement of the consist, drops those passed and those read anew
|
||||
void update_point_limits();
|
||||
// the latched point limits ahead in the direction of travel, taken as the points of the speed table are
|
||||
void apply_point_limits( double &Velocity, double &Distance, double &Next, double &Acceleration );
|
||||
// the way the consist runs, along the track under the vehicle whose movement is measured; zero when it isn't known
|
||||
glm::dvec3 travel_direction() const;
|
||||
// how far the end of the consist lying the farthest along the heading is ahead of the measured vehicle
|
||||
double point_limit_end( glm::dvec3 const &Heading ) const;
|
||||
// whether the state of the cell is latched already
|
||||
bool point_limit_latched( basic_event const *Cell ) const;
|
||||
// how far before a point limit the speed is held down to it
|
||||
double point_limit_approach() const;
|
||||
// returns most recently calculated distance to potential obstacle ahead
|
||||
double TrackObstacle() const;
|
||||
void TablePurger();
|
||||
@@ -587,6 +603,23 @@ private:
|
||||
std::size_t SemNextIndex{ npos };
|
||||
std::size_t SemNextStopIndex{ npos };
|
||||
double dMoveLen = 0.0; // odległość przejechana od ostatniego sprawdzenia tabelki
|
||||
// a PointVelocity limit latched when the head passed its cell. kept apart from the speed table, which is built
|
||||
// anew on a change of direction, a change of the consist or a takeover, and measured by the movement in the world,
|
||||
// so stopping, backing up and going on between the cell and the point keeps it
|
||||
struct point_limit {
|
||||
basic_event const *source { nullptr }; // the cell, as the head passed it
|
||||
double velocity { -1.0 }; // what the cell said then
|
||||
double distance { 0.0 }; // left for the head to the point, along the line
|
||||
double celldistance { 0.0 }; // from the cell to the point; the head farther than that from the point is behind the cell
|
||||
glm::dvec3 heading { 0.0 }; // the way towards the point, in the world
|
||||
double end { 0.0 }; // point_limit_end() at the last update, to follow vehicles coupled or uncoupled at that end
|
||||
bool endknown { false };
|
||||
};
|
||||
std::vector<point_limit> m_pointlimits;
|
||||
TDynamicObject const *m_pointlimitsvehicle { nullptr }; // the vehicle whose movement moves the points
|
||||
glm::dvec3 m_pointlimitsposition { 0.0 }; // where it was at the last update
|
||||
TDynamicObject const *m_pointlimitsends[ 2 ] { nullptr, nullptr }; // the end vehicles of the consist at the last update
|
||||
double m_pointlimitslength { 0.0 }; // and its length
|
||||
basic_event *eSignNext = nullptr; // sygnał zmieniający prędkość, do pokazania na [F2]
|
||||
neighbour_data Obstacle; // nearest vehicle detected ahead on current route
|
||||
|
||||
|
||||
Reference in New Issue
Block a user