From cc564bf0648c0388ad499f7201f6cf481371d9d1 Mon Sep 17 00:00:00 2001 From: ZigRazor Date: Mon, 28 Jun 2021 12:16:44 +0000 Subject: [PATCH] Formatted and trailed Whitespace --- CMakeLists.txt | 18 +++---- CXXGraphConfig.h.in | 6 +-- include/Graph.hpp | 39 ++++++++------ test/BFSTest.cpp | 60 ++++++++++----------- test/CycleCheckTest.cpp | 81 ++++++++++++++--------------- test/DFSTest.cpp | 60 ++++++++++----------- test/DijkstraTest.cpp | 41 ++++++--------- test/DirectedWeightedEdgeTest.cpp | 14 ++--- test/GraphTest.cpp | 11 ++-- test/RWOutputTest.cpp | 29 +++++------ test/UndirectedEdgeTest.cpp | 1 - test/UndirectedWeightedEdgeTest.cpp | 14 ++--- test/main.cpp | 9 ++-- 13 files changed, 188 insertions(+), 195 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77034db07..3a8ed5163 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,8 @@ if(DEBUG) -O0 #no optimization -g #generate debug info ) - -endif(DEBUG) + +endif(DEBUG) option(CODE_COVERAGE "Enable coverage reporting" OFF) if(CODE_COVERAGE) @@ -36,12 +36,12 @@ if(CODE_COVERAGE) "-fprofile-arcs" "--coverage" ) - -endif(CODE_COVERAGE) + +endif(CODE_COVERAGE) # add the library - -add_executable(test_exe test/main.cpp + +add_executable(test_exe test/main.cpp test/NodeTest.cpp test/EdgeTest.cpp test/DirectedEdgeTest.cpp @@ -58,9 +58,9 @@ add_executable(test_exe test/main.cpp target_include_directories(test_exe PUBLIC "${PROJECT_SOURCE_DIR}/include" ) -target_link_libraries(test_exe - libgtest.a - libgtest_main.a +target_link_libraries(test_exe + libgtest.a + libgtest_main.a pthread ) diff --git a/CXXGraphConfig.h.in b/CXXGraphConfig.h.in index dd946630f..445726222 100644 --- a/CXXGraphConfig.h.in +++ b/CXXGraphConfig.h.in @@ -1,4 +1,4 @@ // the configured options and settings for CXXGraph -#define CXXGraph_VERSION_MAJOR @CXXGraph_VERSION_MAJOR@ -#define CXXGraph_VERSION_MINOR @CXXGraph_VERSION_MINOR@ -#define CXXGraph_VERSION_PATCH @CXXGraph_VERSION_PATCH@ \ No newline at end of file +#define CXXGraph_VERSION_MAJOR @CXXGraph_VERSION_MAJOR @ +#define CXXGraph_VERSION_MINOR @CXXGraph_VERSION_MINOR @ +#define CXXGraph_VERSION_PATCH @CXXGraph_VERSION_PATCH @ \ No newline at end of file diff --git a/include/Graph.hpp b/include/Graph.hpp index a020b22fc..f2fe8f115 100644 --- a/include/Graph.hpp +++ b/include/Graph.hpp @@ -469,11 +469,12 @@ namespace CXXGRAPH int writeToStandardFile(std::string OFileName) const; public: - typedef enum E_OutputFormat{ + typedef enum E_OutputFormat + { STANDARD, OUT_1, OUT_2 - }OutputFormat; + } OutputFormat; Graph() = default; Graph(const std::set *> &edgeSet); @@ -484,7 +485,7 @@ namespace CXXGRAPH void removeEdge(unsigned long edgeId); const std::set *> getNodeSet() const; const std::optional *> getEdge(unsigned long edgeId) const; - /*This function generate a list of adjacency matrix with every element of the matrix + /*This function generate a list of adjacency matrix with every element of the matrix * contain the node where is directed the link and the Edge corrispondent to the link */ const AdjacencyMatrix getAdjMatrix() const; @@ -521,20 +522,20 @@ namespace CXXGRAPH */ const std::vector> depth_first_search(const Node &start) const; - /** + /** * \brief * This function uses DFS to check for cycle in the graph. * Pay Attention, this function work only with directed Graph - * + * * @return true if a cycle is detected, else false. ( false is returned also if the graph in indirected) */ const bool isCyclicDirectedGraphDFS() const; - /** + /** * \brief * This function uses BFS to check for cycle in the graph. * Pay Attention, this function work only with directed Graph - * + * * @return true if a cycle is detected, else false. ( false is returned also if the graph in indirected) */ const bool isCyclicDirectedGraphBFS() const; @@ -542,7 +543,7 @@ namespace CXXGRAPH /** * \brief * This function checks if a graph is directed - * + * * @return true if the graph is directed, else false. */ const bool isDirectedGraph() const; @@ -550,7 +551,7 @@ namespace CXXGRAPH /** * \brief * This function write the graph in an output file - * + * * @param format The Output format of the file * @param OFileName The Output File Name * @return 0 if all OK, else return a negative value @@ -631,14 +632,15 @@ namespace CXXGRAPH //adjMatrix[nodeFrom.getId()].push_back(std::make_pair,const Edge>(nodeTo, edge)); } - - template + + template int Graph::writeToStandardFile(std::string OFileName) const { std::ofstream ofile; ofile.open(OFileName); - auto printOut = [&ofile](const Edge *e) { ofile << e->getId() << "," << e->getNodePair().first->getId() << "," << e->getNodePair().second->getId() << std::endl; }; - std::for_each(edgeSet.cbegin(), edgeSet.cend(), printOut); + auto printOut = [&ofile](const Edge *e) + { ofile << e->getId() << "," << e->getNodePair().first->getId() << "," << e->getNodePair().second->getId() << std::endl; }; + std::for_each(edgeSet.cbegin(), edgeSet.cend(), printOut); ofile.close(); return 0; } @@ -1026,13 +1028,16 @@ namespace CXXGRAPH //No Undirected Edge return true; } - - template + + template int Graph::writeToFile(OutputFormat format, std::string OFileName, bool compress) const { - if( format == OutputFormat::STANDARD ){ + if (format == OutputFormat::STANDARD) + { return writeToStandardFile(OFileName); - }else{ + } + else + { //OUTPUT FORMAT NOT RECOGNIZED return -1; } diff --git a/test/BFSTest.cpp b/test/BFSTest.cpp index a2ac024af..8eb380fe0 100644 --- a/test/BFSTest.cpp +++ b/test/BFSTest.cpp @@ -7,16 +7,16 @@ TEST(BFSTest, test_1) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.breadth_first_search(node1); - ASSERT_EQ(res.size(),3); + std::vector> res = graph.breadth_first_search(node1); + ASSERT_EQ(res.size(), 3); ASSERT_TRUE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -28,16 +28,16 @@ TEST(BFSTest, test_2) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.breadth_first_search(node2); - ASSERT_EQ(res.size(),2); + std::vector> res = graph.breadth_first_search(node2); + ASSERT_EQ(res.size(), 2); ASSERT_FALSE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -49,16 +49,16 @@ TEST(BFSTest, test_3) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.breadth_first_search(node2); - ASSERT_EQ(res.size(),3); + std::vector> res = graph.breadth_first_search(node2); + ASSERT_EQ(res.size(), 3); ASSERT_TRUE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -70,16 +70,16 @@ TEST(BFSTest, test_4) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.breadth_first_search(node3); - ASSERT_EQ(res.size(),3); + std::vector> res = graph.breadth_first_search(node3); + ASSERT_EQ(res.size(), 3); ASSERT_TRUE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -91,16 +91,16 @@ TEST(BFSTest, test_5) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.breadth_first_search(node3); - ASSERT_EQ(res.size(),1); + std::vector> res = graph.breadth_first_search(node3); + ASSERT_EQ(res.size(), 1); ASSERT_FALSE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_FALSE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -113,16 +113,16 @@ TEST(BFSTest, test_6) CXXGRAPH::Node node3(3, 3); CXXGRAPH::Node node4(4, 4); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.breadth_first_search(node4); - ASSERT_EQ(res.size(),0); + std::vector> res = graph.breadth_first_search(node4); + ASSERT_EQ(res.size(), 0); ASSERT_FALSE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_FALSE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_FALSE(std::find(res.begin(), res.end(), node3) != res.end()); diff --git a/test/CycleCheckTest.cpp b/test/CycleCheckTest.cpp index 23ef57dfa..b7610256b 100644 --- a/test/CycleCheckTest.cpp +++ b/test/CycleCheckTest.cpp @@ -7,16 +7,16 @@ TEST(CycleCheckTest, test_1) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - bool res= graph.isCyclicDirectedGraphDFS(); - ASSERT_EQ(res,false); + bool res = graph.isCyclicDirectedGraphDFS(); + ASSERT_EQ(res, false); } TEST(CycleCheckTest, test_2) @@ -25,14 +25,14 @@ TEST(CycleCheckTest, test_2) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); CXXGRAPH::Graph graph(edgeSet); - bool res= graph.isCyclicDirectedGraphDFS(); - ASSERT_EQ(res,false); + bool res = graph.isCyclicDirectedGraphDFS(); + ASSERT_EQ(res, false); } TEST(CycleCheckTest, test_3) @@ -41,16 +41,16 @@ TEST(CycleCheckTest, test_3) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); - CXXGRAPH::Graph graph(edgeSet); - bool res= graph.isCyclicDirectedGraphDFS(); - ASSERT_EQ(res,false); + CXXGRAPH::Graph graph(edgeSet); + bool res = graph.isCyclicDirectedGraphDFS(); + ASSERT_EQ(res, false); } TEST(CycleCheckTest, test_4) @@ -59,16 +59,16 @@ TEST(CycleCheckTest, test_4) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node3, node1,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node3, node1, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - bool res= graph.isCyclicDirectedGraphDFS(); - ASSERT_EQ(res,true); + bool res = graph.isCyclicDirectedGraphDFS(); + ASSERT_EQ(res, true); } TEST(CycleCheckTest, test_5) @@ -77,16 +77,16 @@ TEST(CycleCheckTest, test_5) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - bool res= graph.isCyclicDirectedGraphBFS(); - ASSERT_EQ(res,false); + bool res = graph.isCyclicDirectedGraphBFS(); + ASSERT_EQ(res, false); } TEST(CycleCheckTest, test_6) @@ -95,14 +95,14 @@ TEST(CycleCheckTest, test_6) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); CXXGRAPH::Graph graph(edgeSet); - bool res= graph.isCyclicDirectedGraphBFS(); - ASSERT_EQ(res,false); + bool res = graph.isCyclicDirectedGraphBFS(); + ASSERT_EQ(res, false); } TEST(CycleCheckTest, test_7) @@ -111,16 +111,16 @@ TEST(CycleCheckTest, test_7) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); - CXXGRAPH::Graph graph(edgeSet); - bool res= graph.isCyclicDirectedGraphBFS(); - ASSERT_EQ(res,false); + CXXGRAPH::Graph graph(edgeSet); + bool res = graph.isCyclicDirectedGraphBFS(); + ASSERT_EQ(res, false); } TEST(CycleCheckTest, test_8) @@ -129,15 +129,14 @@ TEST(CycleCheckTest, test_8) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node3, node1,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node3, node1, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - bool res= graph.isCyclicDirectedGraphBFS(); - ASSERT_EQ(res,true); + bool res = graph.isCyclicDirectedGraphBFS(); + ASSERT_EQ(res, true); } - diff --git a/test/DFSTest.cpp b/test/DFSTest.cpp index b5d822ff1..ad754830b 100644 --- a/test/DFSTest.cpp +++ b/test/DFSTest.cpp @@ -7,16 +7,16 @@ TEST(DFSTest, test_1) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.depth_first_search(node1); - ASSERT_EQ(res.size(),3); + std::vector> res = graph.depth_first_search(node1); + ASSERT_EQ(res.size(), 3); ASSERT_TRUE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -28,16 +28,16 @@ TEST(DFSTest, test_2) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.depth_first_search(node2); - ASSERT_EQ(res.size(),2); + std::vector> res = graph.depth_first_search(node2); + ASSERT_EQ(res.size(), 2); ASSERT_FALSE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -49,16 +49,16 @@ TEST(DFSTest, test_3) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.depth_first_search(node2); - ASSERT_EQ(res.size(),3); + std::vector> res = graph.depth_first_search(node2); + ASSERT_EQ(res.size(), 3); ASSERT_TRUE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -70,16 +70,16 @@ TEST(DFSTest, test_4) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.depth_first_search(node3); - ASSERT_EQ(res.size(),3); + std::vector> res = graph.depth_first_search(node3); + ASSERT_EQ(res.size(), 3); ASSERT_TRUE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -91,16 +91,16 @@ TEST(DFSTest, test_5) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.depth_first_search(node3); - ASSERT_EQ(res.size(),1); + std::vector> res = graph.depth_first_search(node3); + ASSERT_EQ(res.size(), 1); ASSERT_FALSE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_FALSE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), node3) != res.end()); @@ -113,16 +113,16 @@ TEST(DFSTest, test_6) CXXGRAPH::Node node3(3, 3); CXXGRAPH::Node node4(4, 4); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - std::vector> res= graph.depth_first_search(node4); - ASSERT_EQ(res.size(),0); + std::vector> res = graph.depth_first_search(node4); + ASSERT_EQ(res.size(), 0); ASSERT_FALSE(std::find(res.begin(), res.end(), node1) != res.end()); ASSERT_FALSE(std::find(res.begin(), res.end(), node2) != res.end()); ASSERT_FALSE(std::find(res.begin(), res.end(), node3) != res.end()); diff --git a/test/DijkstraTest.cpp b/test/DijkstraTest.cpp index b5391b65b..b31bf85bf 100644 --- a/test/DijkstraTest.cpp +++ b/test/DijkstraTest.cpp @@ -7,41 +7,38 @@ TEST(DijkstraTest, test_1) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - CXXGRAPH::DijkstraResult res= graph.dijkstra(node1,node3); + CXXGRAPH::DijkstraResult res = graph.dijkstra(node1, node3); ASSERT_TRUE(res.success); ASSERT_EQ(res.errorMessage, ""); ASSERT_EQ(res.result, 2); - } - TEST(DijkstraTest, test_2) { CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,5); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,4); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 4); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - CXXGRAPH::DijkstraResult res= graph.dijkstra(node1,node3); + CXXGRAPH::DijkstraResult res = graph.dijkstra(node1, node3); ASSERT_TRUE(res.success); ASSERT_EQ(res.errorMessage, ""); ASSERT_EQ(res.result, 6); - } TEST(DijkstraTest, test_3) @@ -50,19 +47,18 @@ TEST(DijkstraTest, test_3) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,5); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - CXXGRAPH::DijkstraResult res= graph.dijkstra(node1,node3); + CXXGRAPH::DijkstraResult res = graph.dijkstra(node1, node3); ASSERT_FALSE(res.success); ASSERT_EQ(res.errorMessage, CXXGRAPH::ERR_NO_WEIGHTED_EDGE); ASSERT_EQ(res.result, CXXGRAPH::INF_DOUBLE); - } TEST(DijkstraTest, test_4) @@ -71,16 +67,15 @@ TEST(DijkstraTest, test_4) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); CXXGRAPH::DirectedEdge edge2(2, node2, node3); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - CXXGRAPH::DijkstraResult res= graph.dijkstra(node1,node2); + CXXGRAPH::DijkstraResult res = graph.dijkstra(node1, node2); ASSERT_FALSE(res.success); ASSERT_EQ(res.errorMessage, CXXGRAPH::ERR_DIJ_TARGET_NODE_NOT_REACHABLE); ASSERT_EQ(res.result, -1); - } TEST(DijkstraTest, test_5) @@ -90,16 +85,15 @@ TEST(DijkstraTest, test_5) CXXGRAPH::Node node3(3, 3); CXXGRAPH::Node node4(4, 4); CXXGRAPH::DirectedEdge edge2(2, node2, node3); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - CXXGRAPH::DijkstraResult res= graph.dijkstra(node4,node2); + CXXGRAPH::DijkstraResult res = graph.dijkstra(node4, node2); ASSERT_FALSE(res.success); ASSERT_EQ(res.errorMessage, CXXGRAPH::ERR_DIJ_SOURCE_NODE_NOT_IN_GRAPH); ASSERT_EQ(res.result, CXXGRAPH::INF_DOUBLE); - } TEST(DijkstraTest, test_6) @@ -109,14 +103,13 @@ TEST(DijkstraTest, test_6) CXXGRAPH::Node node3(3, 3); CXXGRAPH::Node node4(4, 4); CXXGRAPH::DirectedEdge edge2(2, node2, node3); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - CXXGRAPH::DijkstraResult res= graph.dijkstra(node1,node4); + CXXGRAPH::DijkstraResult res = graph.dijkstra(node1, node4); ASSERT_FALSE(res.success); ASSERT_EQ(res.errorMessage, CXXGRAPH::ERR_DIJ_TARGET_NODE_NOT_IN_GRAPH); ASSERT_EQ(res.result, CXXGRAPH::INF_DOUBLE); - } \ No newline at end of file diff --git a/test/DirectedWeightedEdgeTest.cpp b/test/DirectedWeightedEdgeTest.cpp index 6d016813f..6f84831fb 100644 --- a/test/DirectedWeightedEdgeTest.cpp +++ b/test/DirectedWeightedEdgeTest.cpp @@ -5,7 +5,7 @@ TEST(DirectedWeightedEdgeTest, Constructor_1) { CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); - CXXGRAPH::DirectedWeightedEdge edge(1, node1, node2,10); + CXXGRAPH::DirectedWeightedEdge edge(1, node1, node2, 10); ASSERT_EQ(*(edge.getNodePair().first), node1); ASSERT_EQ(*(edge.getNodePair().second), node2); ASSERT_EQ(edge.getWeight(), 10); @@ -16,7 +16,7 @@ TEST(DirectedWeightedEdgeTest, Constructor_2) CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge(1, pairNode,10); + CXXGRAPH::DirectedWeightedEdge edge(1, pairNode, 10); ASSERT_EQ(edge.getNodePair(), pairNode); ASSERT_EQ(*(edge.getNodePair().first), node1); ASSERT_EQ(*(edge.getNodePair().second), node2); @@ -28,7 +28,7 @@ TEST(DirectedWeightedEdgeTest, Constructor_3) CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge(1, pairNode,10); + CXXGRAPH::DirectedWeightedEdge edge(1, pairNode, 10); ASSERT_TRUE(edge.isDirected().value()); } @@ -37,7 +37,7 @@ TEST(DirectedWeightedEdgeTest, Constructor_4) CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge(1, pairNode,10); + CXXGRAPH::DirectedWeightedEdge edge(1, pairNode, 10); ASSERT_TRUE(edge.isWeighted().value()); } @@ -47,7 +47,7 @@ TEST(DirectedWeightedEdgeTest, Constructor_5) CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::Edge base_edge(1, pairNode); - CXXGRAPH::DirectedWeightedEdge edge(base_edge,10); + CXXGRAPH::DirectedWeightedEdge edge(base_edge, 10); ASSERT_EQ(edge.getNodePair(), pairNode); ASSERT_EQ(*(edge.getNodePair().first), node1); ASSERT_EQ(*(edge.getNodePair().second), node2); @@ -138,7 +138,7 @@ TEST(DirectedWeightedEdgeTest, Cast_4) CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::UndirectedWeightedEdge base_edge(1, pairNode,10); + CXXGRAPH::UndirectedWeightedEdge base_edge(1, pairNode, 10); CXXGRAPH::DirectedWeightedEdge edge = base_edge; ASSERT_FALSE(base_edge.isDirected().value()); ASSERT_TRUE(base_edge.isWeighted().value()); @@ -154,7 +154,7 @@ TEST(DirectedWeightedEdgeTest, print_1) { CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); - CXXGRAPH::DirectedWeightedEdge edge(1, node1, node2,10); + CXXGRAPH::DirectedWeightedEdge edge(1, node1, node2, 10); std::cout << "Test Print DirectedWeightedEdge" << std::endl; std::cout << edge << std::endl; } diff --git a/test/GraphTest.cpp b/test/GraphTest.cpp index 0b06c9e45..2f17e56f4 100644 --- a/test/GraphTest.cpp +++ b/test/GraphTest.cpp @@ -60,8 +60,8 @@ TEST(GraphTest, GetNodeSet_1) CXXGRAPH::Graph graph(edgeSet); auto nodeSet = graph.getNodeSet(); ASSERT_EQ(nodeSet.size(), 2); - ASSERT_TRUE(nodeSet.find(&node1) != nodeSet.end() ); - ASSERT_TRUE(nodeSet.find(&node2) != nodeSet.end() ); + ASSERT_TRUE(nodeSet.find(&node1) != nodeSet.end()); + ASSERT_TRUE(nodeSet.find(&node2) != nodeSet.end()); } TEST(GraphTest, GetNodeSet_2) @@ -78,10 +78,9 @@ TEST(GraphTest, GetNodeSet_2) CXXGRAPH::Graph graph(edgeSet); auto nodeSet = graph.getNodeSet(); ASSERT_EQ(nodeSet.size(), 3); - ASSERT_TRUE(nodeSet.find(&node1) != nodeSet.end() ); - ASSERT_TRUE(nodeSet.find(&node2) != nodeSet.end() ); - ASSERT_TRUE(nodeSet.find(&node3) != nodeSet.end() ); - + ASSERT_TRUE(nodeSet.find(&node1) != nodeSet.end()); + ASSERT_TRUE(nodeSet.find(&node2) != nodeSet.end()); + ASSERT_TRUE(nodeSet.find(&node3) != nodeSet.end()); } TEST(GraphTest, adj_print_1) diff --git a/test/RWOutputTest.cpp b/test/RWOutputTest.cpp index efea9dc43..ccb351b56 100644 --- a/test/RWOutputTest.cpp +++ b/test/RWOutputTest.cpp @@ -7,36 +7,34 @@ TEST(RWOutputTest, test_1) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,1); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,1); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - int res= graph.writeToFile(); + int res = graph.writeToFile(); ASSERT_EQ(res, 0); } - TEST(RWOutputTest, test_2) { CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,5); - CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3,4); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); + CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 4); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - int res= graph.writeToFile(CXXGRAPH::Graph::OutputFormat::STANDARD); + int res = graph.writeToFile(CXXGRAPH::Graph::OutputFormat::STANDARD); ASSERT_EQ(res, 0); - } TEST(RWOutputTest, test_3) @@ -45,15 +43,15 @@ TEST(RWOutputTest, test_3) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode,5); + CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - int res= graph.writeToFile(CXXGRAPH::Graph::OutputFormat::STANDARD, "output1.csv"); + int res = graph.writeToFile(CXXGRAPH::Graph::OutputFormat::STANDARD, "output1.csv"); ASSERT_EQ(res, 0); } @@ -63,12 +61,11 @@ TEST(RWOutputTest, test_4) CXXGRAPH::Node node2(2, 2); CXXGRAPH::Node node3(3, 3); CXXGRAPH::DirectedEdge edge2(2, node2, node3); - CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3,6); + CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); std::set *> edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); - int res= graph.writeToFile(CXXGRAPH::Graph::OutputFormat::OUT_1, "output1.csv"); + int res = graph.writeToFile(CXXGRAPH::Graph::OutputFormat::OUT_1, "output1.csv"); ASSERT_EQ(res, -1); - } \ No newline at end of file diff --git a/test/UndirectedEdgeTest.cpp b/test/UndirectedEdgeTest.cpp index 4a60ed783..e0f9c0b3c 100644 --- a/test/UndirectedEdgeTest.cpp +++ b/test/UndirectedEdgeTest.cpp @@ -53,7 +53,6 @@ TEST(UndirectedEdgeTest, Constructor_5) ASSERT_FALSE(edge.isWeighted().value()); } - TEST(UndirectedEdgeTest, Cast_1) { CXXGRAPH::Node node1(1, 1); diff --git a/test/UndirectedWeightedEdgeTest.cpp b/test/UndirectedWeightedEdgeTest.cpp index 568b8e666..19e3c97d9 100644 --- a/test/UndirectedWeightedEdgeTest.cpp +++ b/test/UndirectedWeightedEdgeTest.cpp @@ -5,7 +5,7 @@ TEST(UndirectedWeightedEdgeTest, Constructor_1) { CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); - CXXGRAPH::UndirectedWeightedEdge edge(1, node1, node2,10); + CXXGRAPH::UndirectedWeightedEdge edge(1, node1, node2, 10); ASSERT_EQ(*(edge.getNodePair().first), node1); ASSERT_EQ(*(edge.getNodePair().second), node2); ASSERT_EQ(edge.getWeight(), 10); @@ -16,7 +16,7 @@ TEST(UndirectedWeightedEdgeTest, Constructor_2) CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::UndirectedWeightedEdge edge(1, pairNode,10); + CXXGRAPH::UndirectedWeightedEdge edge(1, pairNode, 10); ASSERT_EQ(edge.getNodePair(), pairNode); ASSERT_EQ(*(edge.getNodePair().first), node1); ASSERT_EQ(*(edge.getNodePair().second), node2); @@ -28,7 +28,7 @@ TEST(UndirectedWeightedEdgeTest, Constructor_3) CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::UndirectedWeightedEdge edge(1, pairNode,10); + CXXGRAPH::UndirectedWeightedEdge edge(1, pairNode, 10); ASSERT_FALSE(edge.isDirected().value()); } @@ -37,7 +37,7 @@ TEST(UndirectedWeightedEdgeTest, Constructor_4) CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::UndirectedWeightedEdge edge(1, pairNode,10); + CXXGRAPH::UndirectedWeightedEdge edge(1, pairNode, 10); ASSERT_TRUE(edge.isWeighted().value()); } @@ -47,7 +47,7 @@ TEST(UndirectedWeightedEdgeTest, Constructor_5) CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::Edge base_edge(1, pairNode); - CXXGRAPH::UndirectedWeightedEdge edge(base_edge,10); + CXXGRAPH::UndirectedWeightedEdge edge(base_edge, 10); ASSERT_EQ(edge.getNodePair(), pairNode); ASSERT_EQ(*(edge.getNodePair().first), node1); ASSERT_EQ(*(edge.getNodePair().second), node2); @@ -138,7 +138,7 @@ TEST(UndirectedWeightedEdgeTest, Cast_4) CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); - CXXGRAPH::DirectedWeightedEdge base_edge(1, pairNode,10); + CXXGRAPH::DirectedWeightedEdge base_edge(1, pairNode, 10); CXXGRAPH::UndirectedWeightedEdge edge = base_edge; ASSERT_TRUE(base_edge.isDirected().value()); ASSERT_TRUE(base_edge.isWeighted().value()); @@ -154,7 +154,7 @@ TEST(UndirectedWeightedEdgeTest, print_1) { CXXGRAPH::Node node1(1, 1); CXXGRAPH::Node node2(2, 2); - CXXGRAPH::UndirectedWeightedEdge edge(1, node1, node2,10); + CXXGRAPH::UndirectedWeightedEdge edge(1, node1, node2, 10); std::cout << "Test Print UndirectedWeightedEdge" << std::endl; std::cout << edge << std::endl; } diff --git a/test/main.cpp b/test/main.cpp index fba2d1cb1..5e7ba3088 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -43,8 +43,9 @@ class FooTest : public ::testing::Test { } // namespace project } // namespace my ******* EXAMPLE END ***********/ -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - std::cout << "Running Test for CXXGraph Version " << CXXGraph_VERSION_MAJOR << "." << CXXGraph_VERSION_MINOR << "." << CXXGraph_VERSION_PATCH << std::endl; - return RUN_ALL_TESTS(); +int main(int argc, char **argv) +{ + ::testing::InitGoogleTest(&argc, argv); + std::cout << "Running Test for CXXGraph Version " << CXXGraph_VERSION_MAJOR << "." << CXXGraph_VERSION_MINOR << "." << CXXGraph_VERSION_PATCH << std::endl; + return RUN_ALL_TESTS(); } \ No newline at end of file