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 15:20:56 -06:00
parent ee0999ad05
commit 0cfc261644
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
HW10/MakePermutationMatrix.cpp
View File

@@ -13,7 +13,6 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
std::sort(source.begin(), source.end()); std::sort(source.begin(), source.end());
std::vector<City> myPerm = source; std::vector<City> myPerm = source;
std::vector<City> nextPerm = source; std::vector<City> nextPerm = source;
std::cout << "!!!!!!!!!!!!!! "<< myPerm.size() <<std::endl;
auto offset = (myPerm.size()+1)/size; auto offset = (myPerm.size()+1)/size;
//return vector should be the size of number of processors as they are going to only return their own smallest. //return vector should be the size of number of processors as they are going to only return their own smallest.
@@ -38,11 +37,11 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
// std::cout << "rank " << rank << " source.size() " << source.size() << std::endl; // std::cout << "rank " << rank << " source.size() " << source.size() << std::endl;
// std::cout << "rank " << rank << " offset " << offset << std::endl; // std::cout << "rank " << rank << " offset " << offset << std::endl;
for (int i = 1; i < myPerm.size(); i++) { // for (int i = 1; i < myPerm.size(); i++) {
cost += costMatrix[myPerm[i].GetName()][myPerm[i-1].GetName()]; // cost += costMatrix[myPerm[i].GetName()][myPerm[i-1].GetName()];
std::cout << myPerm[i].GetName() << " "; // std::cout << myPerm[i].GetName() << " ";
} // }
std::cout << std::endl; // std::cout << std::endl;
//Push permutation cost to the localCostVector. //Push permutation cost to the localCostVector.
localCostVector.push_back(cost); localCostVector.push_back(cost);
} while (std::next_permutation(myPerm.begin(), myPerm.end()) ); } while (std::next_permutation(myPerm.begin(), myPerm.end()) );