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:29:16 -06:00
parent 3693629888
commit 8752d54499
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
HW10/MakePermutationMatrix.cpp
View File

@@ -38,18 +38,14 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
do { do {
double cost; double cost;
//Add up the cost of the current permutation. //Add up the cost of the current permutation.
// std::cout << "rank " << rank << " myPerm.size() " << myPerm.size() << std::endl; for (int i = 1; i < myPerm.size(); i++) {
// std::cout << "rank " << rank << " source.size() " << source.size() << std::endl; cost += costMatrix[myPerm[i].GetName()][myPerm[i-1].GetName()];
// std::cout << "rank " << rank << " offset " << offset << std::endl; }
// for (int i = 1; i < myPerm.size(); i++) { std::cout << "cost: " << cost <<std::endl;
// cost += costMatrix[myPerm[i].GetName()][myPerm[i-1].GetName()];
// std::cout << myPerm[i].GetName() << " ";
// }
// 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()) && myPerm!=nextPerm );
// //find the lowest and add it to a lowest vector. // //find the lowest and add it to a lowest vector.
// auto lowest = std::vector<double>(1,localCostVector[0]); // auto lowest = std::vector<double>(1,localCostVector[0]);