Skip to content

Commit

Permalink
Codechange: Use CargoArray for linkgraph refresher. (#13165)
Browse files Browse the repository at this point in the history
`uint capacities[NUM_CARGO]` looks a lot like CargoArray.
  • Loading branch information
PeterN authored Dec 11, 2024
1 parent 677bd52 commit 56510b5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions src/linkgraph/refresh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ LinkRefresher::LinkRefresher(Vehicle *vehicle, HopSet *seen_hops, bool allow_mer
vehicle(vehicle), seen_hops(seen_hops), cargo(INVALID_CARGO), allow_merge(allow_merge),
is_full_loading(is_full_loading)
{
memset(this->capacities, 0, sizeof(this->capacities));

/* Assemble list of capacities and set last loading stations to 0. */
for (Vehicle *v = this->vehicle; v != nullptr; v = v->Next()) {
this->refit_capacities.push_back(RefitDesc(v->cargo_type, v->cargo_cap, v->refit_cap));
Expand Down
2 changes: 1 addition & 1 deletion src/linkgraph/refresh.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class LinkRefresher {
typedef std::set<Hop> HopSet;

Vehicle *vehicle; ///< Vehicle for which the links should be refreshed.
uint capacities[NUM_CARGO]; ///< Current added capacities per cargo ID in the consist.
CargoArray capacities; ///< Current added capacities per cargo ID in the consist.
RefitList refit_capacities; ///< Current state of capacity remaining from previous refits versus overall capacity per vehicle in the consist.
HopSet *seen_hops; ///< Hops already seen. If the same hop is seen twice we stop the algorithm. This is shared between all Refreshers of the same run.
CargoID cargo; ///< Cargo given in last refit order.
Expand Down

0 comments on commit 56510b5

Please sign in to comment.