diff --git a/HW10/MakePermutationMatrix.cpp b/HW10/MakePermutationMatrix.cpp index 5bdcf52..2b3eb31 100644 --- a/HW10/MakePermutationMatrix.cpp +++ b/HW10/MakePermutationMatrix.cpp @@ -38,18 +38,14 @@ std::vector MakePermutationMatrix::MakePermutation(std::vector sou do { double cost; //Add up the cost of the current permutation. -// std::cout << "rank " << rank << " myPerm.size() " << myPerm.size() << std::endl; -// std::cout << "rank " << rank << " source.size() " << source.size() << std::endl; -// std::cout << "rank " << rank << " offset " << offset << std::endl; + for (int i = 1; i < myPerm.size(); i++) { + cost += costMatrix[myPerm[i].GetName()][myPerm[i-1].GetName()]; + } -// for (int i = 1; i < myPerm.size(); i++) { -// cost += costMatrix[myPerm[i].GetName()][myPerm[i-1].GetName()]; -// std::cout << myPerm[i].GetName() << " "; -// } -// std::cout << std::endl; + std::cout << "cost: " << cost <(1,localCostVector[0]);