Trianta/search-algorithms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed graph reading in wrong

Browse Source
This commit is contained in:
TriantaTV 2023-09-15 17:01:51 -05:00
parent 9dcfef9dd5
commit 259e26c257
2 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/algorithm.cpp
View File

@ -6,7 +6,6 @@
#include <queue> #include <queue>
Graph ReadInGraph(std::string fileLocation) { Graph ReadInGraph(std::string fileLocation) {
std::cout << fileLocation << std::endl;
std::ifstream graphFile(fileLocation); std::ifstream graphFile(fileLocation);
if (!graphFile.is_open()) { if (!graphFile.is_open()) {
std::cerr << "Error opening file, check filename" << std::endl; std::cerr << "Error opening file, check filename" << std::endl;
@ -14,14 +13,17 @@ Graph ReadInGraph(std::string fileLocation) {
} }
Graph newGraph; Graph newGraph;
graphFile >> newGraph.nodeCount; graphFile >> newGraph.nodeCount;
newGraph.vertices.resize(newGraph.nodeCount + 1); newGraph.vertices.resize(newGraph.nodeCount);
std::string line; std::string line;
int source, destination, weight; int source, destination, weight;
std::getline(graphFile, line);
while (std::getline(graphFile, line)) { while (std::getline(graphFile, line)) {
std::istringstream iss(line); std::istringstream iss(line);
iss >> source; iss >> source;
source--;
do { do {
iss >> destination >> weight; iss >> destination >> weight;
destination--;
newGraph.vertices.at(source).nodeNumber = source; newGraph.vertices.at(source).nodeNumber = source;
newGraph.AddEdge(source, destination, weight); newGraph.AddEdge(source, destination, weight);
} while (!iss.eof()); } while (!iss.eof());
@ -31,8 +33,7 @@ Graph ReadInGraph(std::string fileLocation) {
} }
Graph::Graph(void) { Graph::Graph(void) {
nodeCount = -1; nodeCount = 0;
} }
Edge::Edge(Vertex* destination, int weight) { Edge::Edge(Vertex* destination, int weight) {

51
test/test.cpp
View File

@ -7,20 +7,57 @@ void tearDown() { ; }
Graph testGraph; Graph testGraph;
void test_AllVerticesAdded(void) void test_GraphReadsIn(void) {
{
testGraph = ReadInGraph("test/input/graphPosLittle"); testGraph = ReadInGraph("test/input/graphPosLittle");
TEST_ASSERT_EQUAL_INT(10, testGraph.nodeCount); TEST_ASSERT_EQUAL_INT(10, testGraph.nodeCount);
} }
void test_AllEdgesAdded(void) void test_AllVerticesAdded(void) {
{ for (int i = 0; i < 10; i++) {
TEST_ASSERT_EQUAL_INT(4, 2+3); TEST_ASSERT_EQUAL_INT(i, testGraph.vertices.at(i).nodeNumber);
}
} }
int main(void) void test_AllEdgesAdded(void) {
{ // Edges for vertex 1
TEST_ASSERT_EQUAL_INT(7, testGraph.vertices.at(0).edges.at(0).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(2, testGraph.vertices.at(0).edges.at(1).destination->nodeNumber + 1);
// Edges for vertex 2
TEST_ASSERT_EQUAL_INT(7, testGraph.vertices.at(1).edges.at(0).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(5, testGraph.vertices.at(1).edges.at(1).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(1, testGraph.vertices.at(1).edges.at(2).destination->nodeNumber + 1);
// Edges for vertex 3
TEST_ASSERT_EQUAL_INT(6, testGraph.vertices.at(2).edges.at(0).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(1, testGraph.vertices.at(2).edges.at(1).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(5, testGraph.vertices.at(2).edges.at(2).destination->nodeNumber + 1);
// Edges for vertex 4
TEST_ASSERT_EQUAL_INT(8, testGraph.vertices.at(3).edges.at(0).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(10, testGraph.vertices.at(3).edges.at(1).destination->nodeNumber + 1);
// Edges for vertex 5
TEST_ASSERT_EQUAL_INT(3, testGraph.vertices.at(4).edges.at(0).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(8, testGraph.vertices.at(4).edges.at(1).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(7, testGraph.vertices.at(4).edges.at(2).destination->nodeNumber + 1);
// Edges for vertex 6
TEST_ASSERT_EQUAL_INT(3, testGraph.vertices.at(5).edges.at(0).destination->nodeNumber + 1);
// Edges for vertex 7
TEST_ASSERT_EQUAL_INT(2, testGraph.vertices.at(6).edges.at(0).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(9, testGraph.vertices.at(6).edges.at(1).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(1, testGraph.vertices.at(6).edges.at(2).destination->nodeNumber + 1);
// Edges for vertex 8
TEST_ASSERT_EQUAL_INT(5, testGraph.vertices.at(7).edges.at(0).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(4, testGraph.vertices.at(7).edges.at(1).destination->nodeNumber + 1);
// Edges for vertex 9
TEST_ASSERT_EQUAL_INT(6, testGraph.vertices.at(8).edges.at(0).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(10, testGraph.vertices.at(8).edges.at(1).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(7, testGraph.vertices.at(8).edges.at(2).destination->nodeNumber + 1);
// Edges for vertex 10
TEST_ASSERT_EQUAL_INT(4, testGraph.vertices.at(9).edges.at(0).destination->nodeNumber + 1);
TEST_ASSERT_EQUAL_INT(9, testGraph.vertices.at(9).edges.at(1).destination->nodeNumber + 1);
}
int main(void) {
UNITY_BEGIN(); UNITY_BEGIN();
RUN_TEST(test_GraphReadsIn);
RUN_TEST(test_AllVerticesAdded); RUN_TEST(test_AllVerticesAdded);
RUN_TEST(test_AllEdgesAdded); RUN_TEST(test_AllEdgesAdded);
return UNITY_END(); return UNITY_END();