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 18:18:50 -06:00
parent ed023ec8e7
commit 350b8bd3d1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HW10/MakePermutationMatrix.cpp
View File

@@ -12,6 +12,7 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
std::vector<double> localCostVector; std::vector<double> localCostVector;
std::size_t offset = 12; std::size_t offset = 12;
std::size_t counter = 0; std::size_t counter = 0;
int vectorOffset = (source.size()+1)/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;
@@ -33,7 +34,7 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
//std::rotate(nextPerm.begin(), nextPerm.begin()+(rank+1)*offset, nextPerm.end()); //std::rotate(nextPerm.begin(), nextPerm.begin()+(rank+1)*offset, nextPerm.end());
//rotate my perm. //rotate my perm.
std::rotate(myPerm.begin(), myPerm.begin()+offset*rank,myPerm.end()); std::rotate(myPerm.begin(), myPerm.begin()+vectorOffset*rank,myPerm.end());
//std::cout << "source.last(): " << source[8].GetName() << std::endl; //std::cout << "source.last(): " << source[8].GetName() << std::endl;
std::cout << "source: "; std::cout << "source: ";
for(int i = 0; i < source.size(); i++){ for(int i = 0; i < source.size(); i++){