diff --git a/imgnew/run1000new.png b/imgnew/run1000new.png new file mode 100644 index 0000000000000000000000000000000000000000..e221026affda95c299c5cd9b7ed1fed24e8ad4fc Binary files /dev/null and b/imgnew/run1000new.png differ diff --git a/imgnew/run100new.png b/imgnew/run100new.png new file mode 100644 index 0000000000000000000000000000000000000000..b5ec110db5c83cec1b91822a570b8e7b5360a5ba Binary files /dev/null and b/imgnew/run100new.png differ diff --git a/imgnew/run3000new.png b/imgnew/run3000new.png new file mode 100644 index 0000000000000000000000000000000000000000..e43f202583834b317d3b1cf40b208029be71b937 Binary files /dev/null and b/imgnew/run3000new.png differ diff --git a/imgnew/run500new.png b/imgnew/run500new.png new file mode 100644 index 0000000000000000000000000000000000000000..a87044e095d426b4212c6c407a398a9cf790de91 Binary files /dev/null and b/imgnew/run500new.png differ diff --git a/src/Makefile b/src/Makefile index 6396eab27480e8b1e2ad3dc41264ab5e22fedde9..f259d4dea24d57097c89062524db506b40512b02 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,2 +1,2 @@ main_omp_v1: main_omp_v1.c - gcc main_omp_v1.c data_structure.c -lm -o main_omp_v1 -fopenmp + gcc main_omp_v1.c data_structure.c -lm -o main_omp_v1 -fopenmp -fno-stack-protector diff --git a/src/main_omp_v1 b/src/main_omp_v1 index bfc79f91db7a7a60d8fbe5ee1cadd22b91f14f1d..d42e65691c718f03630969d7d50954ff91f33d45 100755 Binary files a/src/main_omp_v1 and b/src/main_omp_v1 differ diff --git a/src/main_omp_v1.c b/src/main_omp_v1.c index 88a95cf76b8c0594c8e06556208900ccb19a296b..51645a87e73371c188a38c745de12fc07729bf97 100644 --- a/src/main_omp_v1.c +++ b/src/main_omp_v1.c @@ -79,7 +79,7 @@ void filewrite(matrix *M, int nNodes){ FILE * fp; int i; /* open the file for writing*/ - char strint[10]; + char strint[100]; sprintf(strint, "%d", nNodes); fp = fopen (strcat(strint,"nodes_output.txt"),"w"); @@ -137,11 +137,12 @@ void parallelDijsktra(int nNodes, int NUM_THREADS){ } # pragma omp barrier totalTime = omp_get_wtime() - startTime; - printf("PEPEG\n"); + // printMatrix(Solu); - printf("Process completed in %f microseconds\n", totalTime*1000); + printf("Process completed in %f microseconds\n", totalTime*1000000); filewrite(&Solu, nNodes); destroyMatrix(&Solu); + destroyMatrix(&M); } int main(){