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 20:35:49 -06:00
parent 0b221f8a1d
commit 224f740fe7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HW10/MakePermutationMatrix.cpp
View File

@@ -35,7 +35,7 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
std::cout << nextPerm[i].GetName() << " "; std::cout << nextPerm[i].GetName() << " ";
} }
std::cout << std::endl; std::cout << std::endl;
do { if(!rank){do {
double cost = 0; double 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: ";
@@ -48,8 +48,8 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
//Push permutation cost to the localCostVector. //Push permutation cost to the localCostVector.
localCostVector.push_back(cost); localCostVector.push_back(cost);
counter++; counter++;
} while (std::next_permutation(myPerm.begin(), myPerm.end()) && myPerm != nextPerm); } while (std::next_permutation(myPerm.begin(), myPerm.end()));
}
// //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++) {