Skip to content
Snippets Groups Projects
Commit 289fa725 authored by Jan Trávníček's avatar Jan Trávníček
Browse files

fix illegal work with std container in graphs

parent 7cb2ae74
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -235,13 +235,15 @@ bool AdjacencyListDirectedGraph::removeNode( const Node & node ) ...@@ -235,13 +235,15 @@ bool AdjacencyListDirectedGraph::removeNode( const Node & node )
   
DirectedGraph::removeNode(node); DirectedGraph::removeNode(node);
   
for (auto& i : edges) { for ( auto iter = edges.begin ( ); iter != edges.end ( ); ) {
if (node == i.getFromNode()) { if (node == iter->getFromNode()) {
listRemoveOne(pred[i.getToNode()], node); listRemoveOne(pred[iter->getToNode()], node);
edges.erase(i); iter = edges.erase ( iter );
} else if (node == i.getToNode()) { } else if (node == iter->getToNode()) {
listRemoveOne(succ[i.getFromNode()], node); listRemoveOne(succ[iter->getFromNode()], node);
edges.erase(i); iter = edges.erase ( iter );
} else {
++iter;
} }
} }
   
......
...@@ -234,12 +234,14 @@ bool AdjacencyMatrixDirectedGraph::removeNode( const Node & node ) ...@@ -234,12 +234,14 @@ bool AdjacencyMatrixDirectedGraph::removeNode( const Node & node )
   
adj.erase(search); adj.erase(search);
   
for (auto& i : edges) { for ( auto iter = edges.begin ( ); iter != edges.end ( ); ) {
if (i.getFromNode() == node) { if (iter->getFromNode() == node) {
edges.erase(i); iter = edges.erase(iter);
} else if (i.getToNode() == node) { } else if (iter->getToNode() == node) {
adj[i.getFromNode()].erase(node); adj[iter->getFromNode()].erase(node);
edges.erase(i); iter = edges.erase(iter);
} else {
++iter;
} }
} }
   
......
...@@ -164,13 +164,15 @@ bool AdjacencyListUndirectedGraph::removeNode( const Node & node ) ...@@ -164,13 +164,15 @@ bool AdjacencyListUndirectedGraph::removeNode( const Node & node )
adj.erase(search); adj.erase(search);
UndirectedGraph::removeNode(node); UndirectedGraph::removeNode(node);
   
for (auto& i : edges) { for ( auto iter = edges.begin ( ); iter != edges.end ( ); ) {
if (i.getFirstNode() == node) { if (iter->getFirstNode() == node) {
listRemoveOne(adj[i.getSecondNode()], node); listRemoveOne(adj[iter->getSecondNode()], node);
edges.erase(i); iter = edges.erase(iter);
} else if (i.getSecondNode() == node) { } else if (iter->getSecondNode() == node) {
listRemoveOne(adj[i.getFirstNode()], node); listRemoveOne(adj[iter->getFirstNode()], node);
edges.erase(i); iter = edges.erase(iter);
} else {
++ iter;
} }
} }
   
......
...@@ -169,13 +169,15 @@ bool AdjacencyMatrixUndirectedGraph::removeNode( const Node & node ) ...@@ -169,13 +169,15 @@ bool AdjacencyMatrixUndirectedGraph::removeNode( const Node & node )
adj.erase(search); adj.erase(search);
UndirectedGraph::removeNode(node); UndirectedGraph::removeNode(node);
   
for (auto& i : edges) { for ( auto iter = edges.begin ( ); iter != edges.end ( ); ) {
if (i.getFirstNode() == node) { if (iter->getFirstNode() == node) {
adj[i.getSecondNode()].erase(node); adj[iter->getSecondNode()].erase(node);
edges.erase(i); iter = edges.erase(iter);
} else if (i.getSecondNode() == node) { } else if (iter->getSecondNode() == node) {
adj[i.getFirstNode()].erase(node); adj[iter->getFirstNode()].erase(node);
edges.erase(i); iter = edges.erase(iter);
} else {
++iter;
} }
} }
   
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment