X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=57d2de508cdc27be0dbc17c3953d24bc2d9c4c61;hb=1203771e5aa9b12dca147cd1a84ece9a01c0fccd;hp=33e6ef5f1b4c5c7f22e23432eb3ed87932191e0c;hpb=fb5bd959109927ea02ead1483a4bb0c5a66784a4;p=r2c2.git diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h index 33e6ef5..57d2de5 100644 --- a/source/libr2c2/trainrouteplanner.h +++ b/source/libr2c2/trainrouteplanner.h @@ -63,7 +63,9 @@ private: TrainState state; Msp::Time::TimeDelta delay; int waypoint; + float distance_traveled; float remaining_estimate; + Msp::Time::TimeDelta wait_time; int blocked_by; TrainRoutingState(TrainRoutingInfo &); @@ -82,7 +84,7 @@ private: struct RoutingStep { Msp::Time::TimeDelta time; - Msp::Time::TimeDelta total_estimate; + Msp::Time::TimeDelta cost_estimate; std::vector trains; const RoutingStep *prev;