Skip to content

Add success flag for addEdge #532

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

Closed
danielsuh05 wants to merge 1 commit into from
Closed

Add success flag for addEdge #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion include/CXXGraph/Graph/Graph_decl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,10 @@ class Graph {
* Note: No Thread Safe
*
* @param edge The Edge to insert
* @returns True if the edge was successfully added to the graph
*
*/
virtual void addEdge(const Edge<T> *edge);
virtual bool addEdge(const Edge<T> *edge);

/**
* \brief
Expand Down
12 changes: 9 additions & 3 deletions include/CXXGraph/Graph/Graph_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,15 @@ void Graph<T>::setEdgeSet(const T_EdgeSet<T> &edgeSet) {
}

template <typename T>
void Graph<T>::addEdge(const Edge<T> *edge) {
bool Graph<T>::addEdge(const Edge<T> *edge) {
shared<const Edge<T>> edge_shared;

bool is_directed = edge->isDirected().value_or(false);
bool is_weighted = edge->isWeighted().value_or(false);
if(!edge->isDirected() || !edge->isWeighted()) {
return false;
}

bool is_directed = edge->isDirected().value();
bool is_weighted = edge->isWeighted().value();

if (is_directed) {
if (is_weighted) {
Expand All @@ -93,6 +97,8 @@ void Graph<T>::addEdge(const Edge<T> *edge) {
}

addEdge(edge_shared);

return true;
}

template <typename T>
Expand Down
18 changes: 18 additions & 0 deletions test/GraphTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,24 @@ TEST(GraphTest, RawAddEdge_3) {
ASSERT_FALSE(graph.isUndirectedGraph());
}

TEST(GraphTest, AddEdge_ReturnsFailureFlag) {
CXXGraph::Node<int> node1("1", 1);
CXXGraph::Node<int> node2("2", 1);
CXXGraph::Node<int> node3("3", 1);

CXXGraph::Edge<int> edge1(1, node1, node2);
CXXGraph::Edge<int> edge2(2, node1, node3);
CXXGraph::Edge<int> edge3(3, node2, node3);

CXXGraph::Graph<int> graph;

ASSERT_FALSE(graph.addEdge(&edge1));
ASSERT_FALSE(graph.addEdge(&edge2));
ASSERT_FALSE(graph.addEdge(&edge3));

ASSERT_EQ(graph.getEdgeSet().size(), 0);
}

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