Auto Commit

HW10/MakePermutationMatrix.cpp

@@ -21,12 +21,12 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
 
     //the "nextPerm" is the permutation to stop at.
     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());
     //rotate my perm.
     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::cout << "source.last(): " << source[8].GetName() << std::endl;