mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-20 08:04:57 +01:00
fix: the inspector takes a train below 1 km/h for standing and a bank run for a train (review of #282)
The AI inspects the train while it still creeps to a stop (W4, Shunt to Obey_train) and as it couples, so the 0.05 km/h threshold missed the §19.9 cut-out; it now uses EU07_AI_MOVEMENT. Bank counts as a train, as in the braking tables.
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
#include "McZapkie/hamulce.h"
|
||||
#include "vehicle.h"
|
||||
#include "vehicle/brakesetting.h"
|
||||
#include "vehicle/Driver.h"
|
||||
|
||||
// the brake settings the AI wagon inspector (TController::AutoRewident) chooses for a train, by the
|
||||
// brake instruction Cw-1 (Mw56) §18 and §19 (eu07/maszyna#350)
|
||||
@@ -18,7 +19,7 @@ constexpr int P{bdelay_P};
|
||||
constexpr int R{bdelay_R};
|
||||
constexpr int M{bdelay_M};
|
||||
|
||||
// how the AI runs the consist the inspector looks at: as a train (Obey_train), or shunting it
|
||||
// how the AI runs the consist the inspector looks at: as a train (Obey_train or Bank), or shunting it
|
||||
constexpr bool as_train{true};
|
||||
constexpr bool shunting{false};
|
||||
// whether the train stands, as AutoRewident() tells the inspector
|
||||
@@ -345,6 +346,51 @@ TEST_CASE("brake setting: the inspector doesn't cut a brake out on the run, it w
|
||||
CHECK(false == car->BrakeCutOutByInspector);
|
||||
}
|
||||
|
||||
TEST_CASE("brake setting: a train creeping to a stop or coupling counts as standing, one on the run doesn't") {
|
||||
// the AI looks at the train at a W4 and when it switches from shunting to the train run below 1 km/h, and as it
|
||||
// couples at the coupling speed: the inspector takes those for a standstill
|
||||
CHECK(brake_setting::at_standstill(0.0));
|
||||
CHECK(brake_setting::at_standstill(0.04));
|
||||
CHECK(brake_setting::at_standstill(0.9));
|
||||
CHECK(brake_setting::at_standstill(-0.9));
|
||||
CHECK(false == brake_setting::at_standstill(EU07_AI_MOVEMENT));
|
||||
CHECK(false == brake_setting::at_standstill(30.0));
|
||||
|
||||
// checked at 0.9 km/h: the brake is cut out
|
||||
test::vehicle creeping{passenger_car_definition()};
|
||||
charge_and_apply(creeping);
|
||||
CHECK(inspect_heavy_train(creeping, as_train, brake_setting::at_standstill(0.9)) == brake_setting::cut_out);
|
||||
CHECK(brake_setting::is_cut_out(creeping.mover()));
|
||||
CHECK(creeping->BrakeCutOutByInspector);
|
||||
// checked at 30 km/h: the car keeps its brake
|
||||
test::vehicle running{passenger_car_definition()};
|
||||
charge_and_apply(running);
|
||||
CHECK(inspect_heavy_train(running, as_train, brake_setting::at_standstill(30.0)) == brake_setting::cut_out);
|
||||
CHECK(false == brake_setting::is_cut_out(running.mover()));
|
||||
CHECK(false == running->BrakeCutOutByInspector);
|
||||
running.run(5.0);
|
||||
CHECK(running->BrakePress > 1.0);
|
||||
}
|
||||
|
||||
TEST_CASE("brake setting: a bank engine's run counts as a train, shunting doesn't") {
|
||||
CHECK(brake_setting::runs_as_train(Obey_train));
|
||||
CHECK(brake_setting::runs_as_train(Bank));
|
||||
CHECK(brake_setting::runs_as_train(Obey_train | Connect));
|
||||
CHECK(false == brake_setting::runs_as_train(Shunt));
|
||||
CHECK(false == brake_setting::runs_as_train(Loose_shunt));
|
||||
CHECK(false == brake_setting::runs_as_train(Connect));
|
||||
CHECK(false == brake_setting::runs_as_train(Wait_for_orders));
|
||||
|
||||
// a heavy consist on G banked: the wagon without G has its brake cut out, as in a train
|
||||
test::vehicle car{passenger_car_definition()};
|
||||
charge_and_apply(car);
|
||||
CHECK(inspect_heavy_train(car, brake_setting::runs_as_train(Bank)) == brake_setting::cut_out);
|
||||
CHECK(brake_setting::is_cut_out(car.mover()));
|
||||
// shunted: it's back on P
|
||||
CHECK(inspect_heavy_train(car, brake_setting::runs_as_train(Shunt)) == P);
|
||||
CHECK(false == brake_setting::is_cut_out(car.mover()));
|
||||
}
|
||||
|
||||
TEST_CASE("brake setting: R+Mg brakes as hard as R at speed, the rapid stage of an LSt kept") {
|
||||
// the inspector sets R+Mg (Cw-1 §18.2), the bits of R and Mg together: the valves test the bit of R, not
|
||||
// the whole setting, so the high stage of R at speed stays on with Mg. the EU07's LSt given an Mg here
|
||||
|
||||
Reference in New Issue
Block a user