Auto Commit
This commit is contained in:
@@ -30,11 +30,6 @@ std::vector<double> MakePermutationMatrix::MakePermutation(std::vector<City> sou
|
||||
std::partial_sort(myPerm.begin()+1, myPerm.end(), myPerm.end());
|
||||
|
||||
//std::cout << "source.last(): " << source[8].GetName() << std::endl;
|
||||
std::cout << "source: ";
|
||||
for(int i = 0; i < source.size(); i++){
|
||||
std::cout << source[i].GetName() << " ";
|
||||
}
|
||||
std::cout << std::endl << std::endl;
|
||||
std::cout <<"Rank: " << rank << " next perm: ";
|
||||
for(int i = 0; i < nextPerm.size(); i++){
|
||||
std::cout << nextPerm[i].GetName() << " ";
|
||||
|
||||
@@ -46,20 +46,9 @@ int main(int argc, char* argv[])
|
||||
|
||||
std::vector<double> costs;
|
||||
if(rank){
|
||||
std::cout << "IM HERE" << std::endl;
|
||||
|
||||
cities = SerializeCities::Deserialize(serializedCity);
|
||||
|
||||
std::cout << "After B_cast: ";
|
||||
for(int i = 0; i < cities.size(); i++){
|
||||
std::cout << cities[i].GetName() << " ";
|
||||
}
|
||||
std::cout << std::endl;
|
||||
|
||||
costMatrix = matrixTools::UnflattenMatrix(flatMatrix, citiesSize, citiesSize);
|
||||
//Make permutations
|
||||
std::cout << "source size from main " << cities.size() << std::endl;
|
||||
|
||||
|
||||
}
|
||||
costs = MakePermutationMatrix::GetLowestCost(cities, rank, size, costMatrix);
|
||||
|
||||
Reference in New Issue
Block a user