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:17:42 -06:00
parent b820b84c3f
commit 983860b2ee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HW10/MakePermutationMatrix.cpp
View File

@@ -9,7 +9,7 @@
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;
std::vector<double> localCostVector; std::vector<std::size_t> localCostVector;
std::size_t counter = 0; std::size_t counter = 0;
int vectorOffset = (source.size())/size; int vectorOffset = (source.size())/size;
std::sort(source.begin(), source.end()); std::sort(source.begin(), source.end());
@@ -44,7 +44,7 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
nextPerm = source; nextPerm = source;
} }
do { do {
double 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: ";
for (int i = 0; i < myPerm.size(); i++) { for (int i = 0; i < myPerm.size(); i++) {