josh/gvsu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

floyd.cc -> floyd-sequential.cc

Browse Source 
git-svn-id: svn://anubis/gvsu@196 45c1a28c-8058-47b2-ae61-ca45b979098e
This commit is contained in:
josh 2008-10-13 22:22:03 +00:00
parent 48ab8d89ed
commit 07c119d290
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cs677/hw7/src/Makefile
View File

@ -1,6 +1,6 @@
TARGETS := gen_adj_matrix TARGETS := gen_adj_matrix
TARGETS += floyd TARGETS += floyd-sequential
CXXFLAGS := -fopenmp CXXFLAGS := -fopenmp

11
cs677/hw7/src/floyd.cc → cs677/hw7/src/floyd-sequential.cc
View File

@ -13,6 +13,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include <sys/time.h> /* gettimeofday(), struct timeval */
using namespace std; using namespace std;
void usage(char * progname); void usage(char * progname);
@ -36,6 +37,9 @@ int main(int argc, char * argv[])
int D[2][num_verts][num_verts]; int D[2][num_verts][num_verts];
convertToMatrix(v, num_verts, (int *) &D[0]); convertToMatrix(v, num_verts, (int *) &D[0]);
struct timeval before, after;
gettimeofday(&before, NULL); /* Start timing */
/* Run Floyd's Algorithm on D */ /* Run Floyd's Algorithm on D */
for (int k = 1; k <= num_verts; k++) for (int k = 1; k <= num_verts; k++)
{ {
@ -58,6 +62,8 @@ int main(int argc, char * argv[])
} }
} }
gettimeofday(&after, NULL); /* Stop timing */
cout << "Result:" << endl;
/* Print out the final matrix */ /* Print out the final matrix */
for (int i = 0; i < num_verts; i++) for (int i = 0; i < num_verts; i++)
{ {
@ -71,6 +77,11 @@ int main(int argc, char * argv[])
printf("\n"); printf("\n");
} }
double time_before = before.tv_sec + before.tv_usec / 1000000.0;
double time_after = after.tv_sec + after.tv_usec / 1000000.0;
double diff = time_after - time_before;
cout << "Elapsed time: " << diff << " seconds." << endl;
return 0; return 0;
} }