diff --git a/.gitignore b/.gitignore index c2ac45e6b293b1a4adfb66009f2ac8c96b9f1146..e43b0f988953ae3a84b00331d0ccf5f7d51cb3cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ .DS_Store -prog diff --git a/dijkstra.c b/dijkstra.c index b026e52a5e2e4372d59f6a147861502bd0f7db5f..c65c037c852a054e4a76c1043061c6633d898139 100644 --- a/dijkstra.c +++ b/dijkstra.c @@ -49,10 +49,17 @@ void dijkstra(int graph[NUMBER_OF_VERTICES][NUMBER_OF_VERTICES], int sourceVerte } } } + + // Edit the real graph + for (int vertex = 0; vertex < NUMBER_OF_VERTICES; vertex++) { + graph[sourceVertex][vertex] = dist[vertex]; + } + // Print solution - for (int vertex = 0; vertex < NUMBER_OF_VERTICES; vertex++) { - printf("%d to %ld\n", vertex, dist[vertex]); - } + for (int vertex = 0; vertex < NUMBER_OF_VERTICES; vertex++) { + // printf("%d to %ld\n", vertex, dist[vertex]); + printf("%d to %d\n", vertex, graph[sourceVertex][vertex]); + } } int main(int argc, char *argv[]) { @@ -63,19 +70,24 @@ int main(int argc, char *argv[]) { // Initialize matrix int graph[NUMBER_OF_VERTICES][NUMBER_OF_VERTICES]; + // Seed with NIM: Edward Alexander Jaya + srand(13517115); // Fill the matrix with rand() function - // for (int i = 0; i < NUMBER_OF_VERTICES; i++) { - // for (int j = 0; j < NUMBER_OF_VERTICES; j++) { - // graph[i][j] = rand(); - // } - // } - for (int i = 0; i < NUMBER_OF_VERTICES; i++) { for (int j = 0; j < NUMBER_OF_VERTICES; j++) { - scanf("%d", &graph[i][j]); + // Mod by 100 so the result won't be too big. + graph[i][j] = rand() % 100; } } + // Test function + + // for (int i = 0; i < NUMBER_OF_VERTICES; i++) { + // for (int j = 0; j < NUMBER_OF_VERTICES; j++) { + // scanf("%d", &graph[i][j]); + // } + // } + // graph = { 0, 4, 0, 0, 0, 0, 0, 8, 0, // 4, 0, 8, 0, 0, 0, 0, 11, 0, // 0, 8, 0, 7, 0, 4, 0, 0, 2, @@ -86,9 +98,9 @@ int main(int argc, char *argv[]) { // 8, 11, 0, 0, 0, 0, 1, 0, 7, // 0, 0, 2, 0, 0, 0, 6, 7, 0 }; - // dijkstra(graph, 0); + dijkstra(graph, 1); - // // Print function + // Print function printf("Matrix: \n"); for (int i = 0; i < NUMBER_OF_VERTICES; i++) { for (int j = 0; j < NUMBER_OF_VERTICES; j++) { @@ -96,8 +108,9 @@ int main(int argc, char *argv[]) { } printf("\n"); } + // Send argument vector - // MPI_Init(&argc, &argv); - dijkstra(graph, 0); - // MPI_Finalize(); + MPI_Init(&argc, &argv); + // dijkstra(graph, 0); + MPI_Finalize(); } diff --git a/prog b/prog new file mode 100755 index 0000000000000000000000000000000000000000..36dc0edffef02f645890ce0603622a4818a177b6 Binary files /dev/null and b/prog differ