Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edge equality operator is incorrect (#333) #326

Merged
merged 4 commits into from
Jul 28, 2023
Merged

Edge equality operator is incorrect (#333) #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85579c8
Demonstrate edge set skips unique edges
nrkramer Jul 28, 2023
1f92291
Add helpful output
nrkramer Jul 4, 2023
ca468b0
Add hash output
nrkramer Jul 4, 2023
1b4ed69
Fix for Edge equality operator is incorrect #333
nrkramer Jul 28, 2023
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
1 change: 1 addition & 0 deletions include/Graph/Graph.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <cstring>
#include <deque>
#include <fstream>
#include <sstream>
#include <functional>
#include <iostream>
#include <limits>
Expand Down
2 changes: 1 addition & 1 deletion include/Utility/PointerHash.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ template <typename T>
bool operator==(shared<const Edge<T>> p1, shared<const Edge<T>> p2) {
return p1->getNodePair().first->getUserId() ==
p2->getNodePair().first->getUserId() &&
p2->getNodePair().second->getUserId() ==
p1->getNodePair().second->getUserId() ==
p2->getNodePair().second->getUserId();
}
} // namespace CXXGraph
Expand Down
1 change: 1 addition & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ if(TEST)
PUBLIC ${zlib_BINARY_DIR}
PUBLIC ${zlib_SOURCE_DIR}
)

target_link_libraries(test_exe
PUBLIC GTest::gtest_main
PUBLIC zlibstatic
Expand Down
55 changes: 55 additions & 0 deletions test/GraphTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
CXXGraph::DirectedEdge<int> edge3(2, node3, node1);

CXXGraph::Graph<int> graph;

graph.addEdge(&edge1);
graph.addEdge(&edge2);
graph.addEdge(&edge3);
Expand Down Expand Up @@ -197,6 +198,60 @@
ASSERT_EQ(graph.getEdgeSet().size(), 3);
}

TEST(GraphTest, DirectedEdge_hashequality) {
CXXGraph::Node<int> node1("node1 (0)", 0);
CXXGraph::Node<int> node2("node2 (1)", 1);
CXXGraph::Node<int> node3("node3 (2)", 2);
CXXGraph::Node<int> node4("node4 (3)", 3);
CXXGraph::Node<int> node5("node5 (4)", 4);
CXXGraph::Node<int> node6("node6 (5)", 5);
CXXGraph::Node<int> node7("node7 (6)", 6);

CXXGraph::DirectedEdge<int> edge1(0, node1, node2);
CXXGraph::DirectedEdge<int> edge2(1, node2, node3);
CXXGraph::DirectedEdge<int> edge3(3, node5, node4);
CXXGraph::DirectedEdge<int> edge4(4, node5, node3);
CXXGraph::DirectedEdge<int> edge5(5, node5, node2);
CXXGraph::DirectedEdge<int> edge6(6, node5, node6);
CXXGraph::DirectedEdge<int> edge7(7, node5, node1);
CXXGraph::DirectedEdge<int> edge8(8, node5, node7);
CXXGraph::DirectedEdge<int> edge9(9, node3, node4);
CXXGraph::DirectedEdge<int> edge10(10, node6, node2);
CXXGraph::DirectedEdge<int> edge11(11, node7, node2);

CXXGraph::T_EdgeSet<int> edges;
auto addEdge = [&](CXXGraph::DirectedEdge<int>& edge)
{
size_t currSize = edges.size();
auto sharedEdge = CXXGraph::make_shared<CXXGraph::DirectedEdge<int>>(edge.getId(), edge.getFrom(), edge.getTo());
edges.insert(sharedEdge);
if ((currSize + 1) != edges.size())
{
std::cout << "Skipped " << edge.getNodePair().first->getUserId() << " --> " << edge.getNodePair().second->getUserId() << " (hash: " << CXXGraph::edgeHash<int>{}(sharedEdge) << ")" << std::endl;

Check warning on line 230 in test/GraphTest.cpp

View check run for this annotation

Codecov / codecov/patch

test/GraphTest.cpp#L230 

Added line #L230 was not covered by tests
} else {
std::cout << "Added " << edge.getNodePair().first->getUserId() << " --> " << edge.getNodePair().second->getUserId() << " (hash: " << CXXGraph::edgeHash<int>{}(sharedEdge) << ")" << std::endl;
}
};

addEdge(edge1);
addEdge(edge2);
addEdge(edge3);
addEdge(edge4);
addEdge(edge5);
addEdge(edge6);
addEdge(edge7);
addEdge(edge8);
addEdge(edge9);
addEdge(edge10);
addEdge(edge11);

CXXGraph::Graph<int> graph;
graph.setEdgeSet(edges);

// Check that all of the edges have been added to the graph
ASSERT_EQ(graph.getEdgeSet().size(), 11);
}

TEST(GraphTest, adj_print_1) {
CXXGraph::Node<int> node1("1", 1);
CXXGraph::Node<int> node2("2", 2);
Expand Down
Loading