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 19:23:21 -06:00
parent 3feb649fdc
commit 12fe9153bd
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

@@ -11,7 +11,7 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
std::vector<double> returnVector; std::vector<double> returnVector;
std::vector<double> localCostVector; std::vector<double> localCostVector;
std::size_t counter = 0; std::size_t counter = 0;
int vectorOffset = (source.size()+1)/2; int vectorOffset = (source.size())/2;
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;
@@ -20,7 +20,7 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
returnVector.resize(source.size(), 0); returnVector.resize(source.size(), 0);
//the "nextPerm" is the permutation to stop at. //the "nextPerm" is the permutation to stop at.
std::rotate(nextPerm.begin(), nextPerm.begin()+(rank+1), nextPerm.end()); std::rotate(nextPerm.begin(), nextPerm.begin()+(rank+vectorOffset), nextPerm.end());
//rotate my perm. //rotate my perm.
std::rotate(myPerm.begin(), myPerm.begin()+rank,myPerm.end()); std::rotate(myPerm.begin(), myPerm.begin()+rank,myPerm.end());