diff --git a/FinalProject/Matrix.txt b/FinalProject/Matrix.txt index 52b9d03..2dd9597 100644 --- a/FinalProject/Matrix.txt +++ b/FinalProject/Matrix.txt @@ -4,6 +4,7 @@ 1 4 1 5 2 6 7 2 -9 8 7 -6 5 4 -3 2 1 \ No newline at end of file +9 8 7 3 +6 5 4 5 +3 2 1 7 +7 6 9 10 \ No newline at end of file diff --git a/FinalProject/a.out b/FinalProject/a.out index 0515b85..9c51523 100755 Binary files a/FinalProject/a.out and b/FinalProject/a.out differ diff --git a/FinalProject/main.cpp b/FinalProject/main.cpp index 703c48b..7a4c9fd 100644 --- a/FinalProject/main.cpp +++ b/FinalProject/main.cpp @@ -17,9 +17,9 @@ std::vector > AB_serial = std::vector >( void print_matrix(std::vector > mat); -void serial_version(); +void serial_matrix_multiplication(); void compute_interval(int start, int interval); -void multiplyMatrix(int rank, int size); +void parallel_matrix_multiplication(int rank, int size); void read_in_matrices(); void print_help(); void determinant(); @@ -54,7 +54,7 @@ int main(int argc, char** argv) { MPI_Barrier(MCW); MPI_Bcast(&user_input, 1, MPI_INT, 0, MCW ); if (user_input == '1') - multiplyMatrix(rank, size); + parallel_matrix_multiplication(rank, size); else if (user_input == '2'){ if(!rank) reduced_row(); @@ -186,7 +186,7 @@ void print_matrix(std::vector >mat) { myfile << endl; cout << endl; } -void serial_version(){ +void serial_matrix_multiplication(){ for (int i = 0; i