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 10:35:55 -06:00
parent 426061b78b
commit a79c605d76
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HW10/MakePermutationMatrix.cpp
View File

@@ -30,10 +30,13 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
//Add up the cost of the current permutation. //Add up the cost of the current permutation.
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 << 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()), myPerm != nextPerm); } 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]);
for(int i = 0; i < localCostVector.size(); i++) { for(int i = 0; i < localCostVector.size(); i++) {