bradybod-usu/cs5500_parallel_prog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto Commit

Browse Source
This commit is contained in:
bbod
2020-03-30 23:41:41 -06:00
parent 7067f86e6c
commit bd8b5ed469
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
HW10/MakePermutationMatrix.cpp
View File

@@ -6,7 +6,7 @@
#include "mpi.h" #include "mpi.h"
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <limits.h> #include <climits>
std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> source, int rank, int size, std::vector<std::vector<double>> costMatrix){ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> source, int rank, int size, std::vector<std::vector<double>> costMatrix){
std::vector<double> returnVector; std::vector<double> returnVector;
@@ -47,13 +47,13 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
do { do {
std::size_t cost = 0; std::size_t cost = 0;
//Add up the cost of the current permutation. //Add up the cost of the current permutation.
// std::cout <<"Rank: " << rank << " Current perm: "; // std::cout <<"Rank: " << rank << " Current perm: ";
std::cout << "Rank: "<< rank; //std::cout << "Rank: "<< rank;
for (int i = 0; i < myPerm.size(); i++) { for (int i = 0; i < myPerm.size(); i++) {
std::cout << " " << myPerm[i].GetName(); //std::cout << " " << myPerm[i].GetName();
cost += costMatrix[myPerm[i].GetName()][myPerm[i-1].GetName()]; cost += costMatrix[myPerm[i].GetName()][myPerm[i-1].GetName()];
} }
std::cout << std::endl << std::endl; //std::cout << std::endl << std::endl;
if(cost < lowest) if(cost < lowest)
lowest = cost; lowest = cost;
//Push permutation cost to the localCostVector. //Push permutation cost to the localCostVector.