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-31 00:45:45 -06:00
parent 49ac17ac65
commit 8ee343f133
2 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
HW10/MakePermutationMatrix.cpp
View File

@@ -29,18 +29,6 @@ long double MakePermutationMatrix::MakePermutation(std::vector<City> source, int
if(rank!=0)
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;
// std::cout <<"Rank: " << rank << " next perm: ";
// for(int i = 0; i < nextPerm.size(); i++){
// std::cout << nextPerm[i].GetName() << " ";
// }
// std::cout << std::endl;
// std::cout <<"Rank: " << rank << " My perm: ";
// for(int i = 0; i < myPerm.size(); i++){
// std::cout << myPerm[i].GetName() << " ";
// }
// std::cout << std::endl;
if(rank == size-1){
nextPerm = source;
}
@@ -61,22 +49,6 @@ long double MakePermutationMatrix::MakePermutation(std::vector<City> source, int
//localCostVector.push_back(cost);
} while (std::next_permutation(myPerm.begin(), myPerm.end()) && myPerm!=nextPerm);
// //find the lowest and add it to a lowest vector.
// auto lowest = std::vector<double>(1,localCostVector[0]);
// for(int i = 0; i < localCostVector.size(); i++) {
// if(localCostVector[i] < lowest[0])
// lowest[0] = localCostVector[i];
// std::cout << lowest[0] << " ";
// }
std::cout<< "Rank: "<< rank<< "lowest cost: "<< lowest << std::endl;
std::cout << "Rank: "<< rank <<" Last Perm: ";
for(int i = 0; i < myPerm.size(); i++){
std::cout << myPerm[i].GetName() << " ";
}
std::cout << std::endl;
//MPI_Gather(&localCostVector,1, MPI_DOUBLE, &returnVector,1, MPI_DOUBLE,0, MPI_COMM_WORLD);
return lowest;
}

9
HW10/main.cpp
View File

@@ -23,12 +23,6 @@ int main(int argc, char* argv[])
citiesSize = cities.size();
//Make costMatrix
costMatrix = CostMatrixGenerator::GenerateCostMatrix(cities);
for(int i = 0; i < citiesSize; i++){
for(int j = 0; j<citiesSize; j++){
std::cout << costMatrix[i][j] << " ";
}
std::cout << std::endl;
}
flatMatrix = matrixTools::FlattenMatrix(costMatrix);
serializedCity = SerializeCities::Serialize(cities);
}
@@ -57,13 +51,12 @@ int main(int argc, char* argv[])
}
lowestCost = MakePermutationMatrix::GetLowestCost(cities, rank, size, costMatrix);
std::cout << "The lowest cost is " << lowestCost << std::endl;
// if(!rank){
// std::cout << costs.size() << std::endl;
// std::cout << costs[0];
// }
MPI_Finalize();
std::cout << "The lowest cost is " << lowestCost << std::endl;
return 0;
}