loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename PluginGraph::EdgeCreatesCycle

Browse Source 
It's really got nothing to do with cycles.
This commit is contained in:
Oliver Hamlet
2022-12-02 14:17:09 +00:00
parent d145d234e2
commit b3436d23d8
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/sorting/plugin_graph.cpp
+18 -21
View File
@@ -304,36 +304,33 @@ void PluginGraph::CheckForCycles() const {
graph_, visitor(CycleDetector()).vertex_index_map(vertexIndexMap));
}
bool PluginGraph::EdgeCreatesCycle(const vertex_t& fromVertex,
const vertex_t& toVertex) {
if (pathsCache_.count(GraphPath{toVertex, fromVertex}) != 0) {
bool PluginGraph::PathExists(const vertex_t& fromVertex,
const vertex_t& toVertex) {
if (pathsCache_.count(GraphPath{fromVertex, toVertex}) != 0) {
return true;
}
auto start = toVertex;
auto end = fromVertex;
std::queue<vertex_t> forwardQueue;
std::queue<vertex_t> reverseQueue;
std::unordered_set<vertex_t> forwardVisited;
std::unordered_set<vertex_t> reverseVisited;
forwardQueue.push(start);
forwardVisited.insert(start);
reverseQueue.push(end);
reverseVisited.insert(end);
forwardQueue.push(fromVertex);
forwardVisited.insert(fromVertex);
reverseQueue.push(toVertex);
reverseVisited.insert(toVertex);
while (!forwardQueue.empty() && !reverseQueue.empty()) {
if (!forwardQueue.empty()) {
auto v = forwardQueue.front();
const auto v = forwardQueue.front();
forwardQueue.pop();
if (v == end || reverseVisited.count(v) > 0) {
if (v == toVertex || reverseVisited.count(v) > 0) {
return true;
}
for (auto adjacentV :
for (const auto adjacentV :
boost::make_iterator_range(boost::adjacent_vertices(v, graph_))) {
if (forwardVisited.count(adjacentV) == 0) {
pathsCache_.insert(GraphPath{start, adjacentV});
pathsCache_.insert(GraphPath{fromVertex, adjacentV});
forwardVisited.insert(adjacentV);
forwardQueue.push(adjacentV);
@@ -341,15 +338,15 @@ bool PluginGraph::EdgeCreatesCycle(const vertex_t& fromVertex,
}
}
if (!reverseQueue.empty()) {
auto v = reverseQueue.front();
const auto v = reverseQueue.front();
reverseQueue.pop();
if (v == start || forwardVisited.count(v) > 0) {
if (v == fromVertex || forwardVisited.count(v) > 0) {
return true;
}
for (auto adjacentV : boost::make_iterator_range(
for (const auto adjacentV : boost::make_iterator_range(
boost::inv_adjacent_vertices(v, graph_))) {
if (reverseVisited.count(adjacentV) == 0) {
pathsCache_.insert(GraphPath{adjacentV, end});
pathsCache_.insert(GraphPath{adjacentV, toVertex});
reverseVisited.insert(adjacentV);
reverseQueue.push(adjacentV);
@@ -605,7 +602,7 @@ void PluginGraph::AddGroupEdges(
continue;
}
if (EdgeCreatesCycle(parentVertex.value(), vertex)) {
if (PathExists(vertex, parentVertex.value())) {
auto& fromPlugin = graph_[parentVertex.value()];
auto& toPlugin = graph_[vertex];
@@ -708,7 +705,7 @@ void PluginGraph::AddOverlapEdges() {
thisPluginOverridesMoreFormIDs ? vertex : otherVertex;
vertex_t toVertex = thisPluginOverridesMoreFormIDs ? otherVertex : vertex;
if (!EdgeCreatesCycle(fromVertex, toVertex))
if (!PathExists(toVertex, fromVertex))
AddEdge(fromVertex, toVertex, EdgeType::overlap);
}
}
@@ -773,7 +770,7 @@ void PluginGraph::AddTieBreakEdges() {
vertex_t fromVertex = thisPluginShouldLoadEarlier ? vertex : otherVertex;
vertex_t toVertex = thisPluginShouldLoadEarlier ? otherVertex : vertex;
if (!EdgeCreatesCycle(fromVertex, toVertex))
if (!PathExists(toVertex, fromVertex))
AddEdge(fromVertex, toVertex, EdgeType::tieBreak);
}
}
src/api/sorting/plugin_graph.h
+1 -1
View File
@@ -90,7 +90,7 @@ public:
private:
std::optional<vertex_t> GetVertexByName(const std::string& name) const;
bool EdgeCreatesCycle(const vertex_t& u, const vertex_t& v);
bool PathExists(const vertex_t& fromVertex, const vertex_t& toVertex);
void AddEdge(const vertex_t& fromVertex,
const vertex_t& toVertex,