From 2f3770d0b3041fd59e8b9a7a334b9f14aed8cdcc Mon Sep 17 00:00:00 2001 From: EdwardAJ <13517115@std.stei.itb.ac.id> Date: Sat, 22 Feb 2020 08:42:23 +0700 Subject: [PATCH] Put request to matrix --- .gitignore | 1 - dijkstra.c | 43 ++++++++++++++++++++++++++++--------------- prog | Bin 0 -> 8988 bytes 3 files changed, 28 insertions(+), 16 deletions(-) create mode 100755 prog diff --git a/.gitignore b/.gitignore index c2ac45e..e43b0f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ .DS_Store -prog diff --git a/dijkstra.c b/dijkstra.c index b026e52..c65c037 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 GIT binary patch literal 8988 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 literal 0 HcmV?d00001 -- GitLab