dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: [Linkgraph] Store edges in each node and not in a global matrix.

Browse Source
This commit is contained in:
Michael Lutz
2023-01-01 17:12:56 +01:00
parent 2fee8ecdda
commit fe27db3dfd
7 changed files with 101 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/linkgraph/linkgraphjob.cpp
View File

@@ -180,39 +180,12 @@ LinkGraphJob::~LinkGraphJob()
void LinkGraphJob::Init()
{
uint size = this->Size();
this->nodes.resize(size);
this->edges.Resize(size, size);
this->nodes.reserve(size);
for (uint i = 0; i < size; ++i) {
this->nodes[i].Init(this->link_graph[i].Supply());
EdgeAnnotation *node_edges = this->edges[i];
for (uint j = 0; j < size; ++j) {
node_edges[j].Init();
}
this->nodes.emplace_back(this->link_graph.nodes[i]);
}
}
/**
* Initialize a linkgraph job edge.
*/
void LinkGraphJob::EdgeAnnotation::Init()
{
this->demand = 0;
this->flow = 0;
this->unsatisfied_demand = 0;
}
/**
* Initialize a Linkgraph job node. The underlying memory is expected to be
* freshly allocated, without any constructors having been called.
* @param supply Initial undelivered supply.
*/
void LinkGraphJob::NodeAnnotation::Init(uint supply)
{
this->undelivered_supply = supply;
new (&this->flows) FlowStatMap;
new (&this->paths) PathList;
}
/**
* Add this path as a new child to the given base path, thus making this path
* a "fork" of the base path.