Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions include/CXXGraph/Graph/Graph_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ std::optional<CXXGraph::id_t> Graph<T>::addEdge(shared<const Edge<T>> edge) {

auto& [from, to] = edge->getNodePair();

// Connected nodes are no longer isolated
isolatedNodesSet.erase(from);
isolatedNodesSet.erase(to);

(*cachedAdjListOut)[from].emplace_back(to, edge);
(*cachedAdjListIn)[to].emplace_back(from, edge);
if (!edge.get()->isDirected().value_or(true)) {
Expand Down Expand Up @@ -180,7 +184,10 @@ void Graph<T>::removeEdge(const std::string& edgeUserId) {
edgeSet.erase(std::find_if(this->edgeSet.begin(), this->edgeSet.end(),
[edgeOpt](const Edge<T> *edge) { return (*(edgeOpt.value()) == *edge); }));
*/
edgeSet.erase(edgeSet.find(edgeOpt.value()));
auto edgeIt = edgeSet.find(edgeOpt.value());
if (edgeIt != edgeSet.end()) {
edgeSet.erase(edgeIt);
}

auto& [from, to] = edgeOpt.value().get()->getNodePair();

Expand Down Expand Up @@ -255,6 +262,19 @@ void Graph<T>::removeEdge(const std::string& edgeUserId) {
}
}
}

// Endpoints that no longer appear in any adjacency list become isolated
// nodes (same approach as Hypergraph::unregisterEdgeFromIncidence_).
auto stillConnected = [this](const shared<const Node<T>>& node) {
return cachedAdjListOut->find(node) != cachedAdjListOut->end() ||
cachedAdjListIn->find(node) != cachedAdjListIn->end();
};
if (!stillConnected(from)) {
isolatedNodesSet.insert(from);
}
if (!stillConnected(to)) {
isolatedNodesSet.insert(to);
}
}
}

Expand All @@ -266,7 +286,10 @@ void Graph<T>::removeEdge(const CXXGraph::id_t edgeId) {
edgeSet.erase(std::find_if(this->edgeSet.begin(), this->edgeSet.end(),
[edgeOpt](const Edge<T> *edge) { return (*(edgeOpt.value()) == *edge); }));
*/
edgeSet.erase(edgeSet.find(edgeOpt.value()));
auto edgeIt = edgeSet.find(edgeOpt.value());
if (edgeIt != edgeSet.end()) {
edgeSet.erase(edgeIt);
}

auto& [from, to] = edgeOpt.value().get()->getNodePair();

Expand Down Expand Up @@ -341,6 +364,19 @@ void Graph<T>::removeEdge(const CXXGraph::id_t edgeId) {
}
}
}

// Endpoints that no longer appear in any adjacency list become isolated
// nodes (same approach as Hypergraph::unregisterEdgeFromIncidence_).
auto stillConnected = [this](const shared<const Node<T>>& node) {
return cachedAdjListOut->find(node) != cachedAdjListOut->end() ||
cachedAdjListIn->find(node) != cachedAdjListIn->end();
};
if (!stillConnected(from)) {
isolatedNodesSet.insert(from);
}
if (!stillConnected(to)) {
isolatedNodesSet.insert(to);
}
}
}

Expand Down
24 changes: 24 additions & 0 deletions test/GraphTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1411,6 +1411,30 @@ TEST(GraphTest, remove_node_connectedNode2) {
ASSERT_EQ(graph.getEdgeSet().size(), 1);
}

TEST(GraphTest, removeEdge_keepsOrphanNodesIsolated) {
// Regression for #497: removeEdge must not drop endpoints that were only
// introduced via that edge; they should remain as isolated nodes.
CXXGraph::Node<int> a("A", 1);
CXXGraph::Node<int> b("B", 2);
CXXGraph::DirectedWeightedEdge<int> ab("ab", a, b, 1.0);

CXXGraph::Graph<int> graph;
graph.addEdge(&ab);

ASSERT_EQ(graph.getNodeSet().size(), 2);
ASSERT_EQ(graph.getEdgeSet().size(), 1);
ASSERT_TRUE(graph.getNode("A").has_value());
ASSERT_TRUE(graph.getNode("B").has_value());

graph.removeEdge("ab");

ASSERT_EQ(graph.getEdgeSet().size(), 0);
ASSERT_EQ(graph.getNodeSet().size(), 2);
ASSERT_EQ(graph.getIsolatedNodeSet().size(), 2);
ASSERT_TRUE(graph.getNode("A").has_value());
ASSERT_TRUE(graph.getNode("B").has_value());
}

TEST(GraphTest, remove_node_removeInvalidNode) {
/** Test to call the remove_node function on a node that was never added. In
* this case getNode will return an optional that is nullptr*/
Expand Down
Loading