From 8ee343f13386f222b48071abc349bd0791304d5c Mon Sep 17 00:00:00 2001
From: bbod <bradybod@gmail.com>
Date: Tue, 31 Mar 2020 00:45:45 -0600
Subject: [PATCH] Auto Commit

---
 HW10/MakePermutationMatrix.cpp | 28 ----------------------------
 HW10/main.cpp                  |  9 +--------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/HW10/MakePermutationMatrix.cpp b/HW10/MakePermutationMatrix.cpp
index 64a4338..194ef00 100644
--- a/HW10/MakePermutationMatrix.cpp
+++ b/HW10/MakePermutationMatrix.cpp
@@ -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;
 }
 
diff --git a/HW10/main.cpp b/HW10/main.cpp
index 93e8f87..2417ef7 100644
--- a/HW10/main.cpp
+++ b/HW10/main.cpp
@@ -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;
 }
\ No newline at end of file