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 23:06:41 -06:00
parent 3b8b5c007a
commit fbd9260e3b
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

@@ -21,12 +21,12 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
//the "nextPerm" is the permutation to stop at. //the "nextPerm" is the permutation to stop at.
if(rank != size-1) if(rank != size-1)
std::rotate(nextPerm.begin(), nextPerm.begin() + (rank + vectorOffset), nextPerm.end()); std::rotate(nextPerm.begin(), nextPerm.begin() + ((rank*vectorOffset)+vectorOffset + vectorOffset), nextPerm.end());
std::partial_sort(nextPerm.begin()+1, nextPerm.end(), nextPerm.end()); std::partial_sort(nextPerm.begin()+1, nextPerm.end(), nextPerm.end());
//rotate my perm. //rotate my perm.
if(rank!=0) if(rank!=0)
std::rotate(myPerm.begin(), myPerm.begin()+(rank-1+vectorOffset),myPerm.end()); std::rotate(myPerm.begin(), myPerm.begin()+(((rank-1)*vectorOffset)+vectorOffset),myPerm.end());
std::partial_sort(myPerm.begin()+1, myPerm.end(), myPerm.end()); std::partial_sort(myPerm.begin()+1, myPerm.end(), myPerm.end());
//std::cout << "source.last(): " << source[8].GetName() << std::endl; //std::cout << "source.last(): " << source[8].GetName() << std::endl;