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 11:16:08 -06:00
parent ea9354b0c1
commit 5d8b8f11b3
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HW10/ReadFromFile.cpp
View File

@@ -14,7 +14,6 @@ std::vector<City> ReadFromFile::ReadFile(const std::string& fileName)
City city; City city;
city.SetCoordinates(x, y, name); city.SetCoordinates(x, y, name);
cities.push_back(city); cities.push_back(city);
std::cout << "name: " << name << std::endl;
name++; name++;
} }
return cities; return cities;

3
HW10/main.cpp
View File

@@ -47,6 +47,9 @@ int main(int argc, char* argv[])
costMatrix = matrixTools::UnflattenMatrix(flatMatrix, citiesSize, citiesSize); costMatrix = matrixTools::UnflattenMatrix(flatMatrix, citiesSize, citiesSize);
//Make permutations //Make permutations
std::cout << "source size from main " << cities.size() << std::endl; std::cout << "source size from main " << cities.size() << std::endl;
for(int i = 0; i < cities.size(); i++){
std::cout << cities[i].GetName() << " " << std::endl;
}
costs = MakePermutationMatrix::GetLowestCost(cities, rank, size, costMatrix); costs = MakePermutationMatrix::GetLowestCost(cities, rank, size, costMatrix);
} }