replace HC with PLS

bin/tspTest.cpp

@@ -16,8 +16,7 @@ int main(int argc, char* argv[]){
     
     unsigned INITIAL_SOLUTIONS = 1000000;
     unsigned ARCHIVE_BOUND = 100;
-    unsigned MAX_ITER = 100;
-    long long int TIME_LIMIT = 20; //ms per solution
+    long long int TIME_LIMIT = 20000; //ms
 
     std::cout << "Reading instance files..." << std::endl;
     tsp::TSP tsp_instance1("../../instances/tsp/tsp_test/cgC50_10_01.txt");
@@ -41,38 +40,29 @@ int main(int argc, char* argv[]){
     std::cout << "Initial archive contains " << bounded_archive.size() << " solutions : " << std::endl;
     std::cout << bounded_archive << std::endl;
 
-    opt::TimeCriterion<SOL> time_criterion(TIME_LIMIT);
+    opt::TimeCriterion<BOUNDED_ARCHIVE> time_criterion(TIME_LIMIT);
 
-    for(unsigned i = 0; i < MAX_ITER; ++i){
-        // Pick a random solution within the archive.
-        SOL tmp_sol;
-        if(bounded_archive.size()){
-            unsigned random_sol_idx = core::RNGHelper::get()->random(bounded_archive.size());
-            tmp_sol = bounded_archive[random_sol_idx];
-        }else{
-            tmp_sol = bounded_archive[0];
-        }
+    core::HammingDiversityCriterion<SOL> global_diversity;
 
-        // Explore solution's neighborhood.
-        representation::TwoOptNeighbor<SOL> optNeighbor;
-        opt::OrderNeighborhood<SOL> orderNeighborhood(optNeighbor);
-        opt::FirstImprNeighborhoodExplorer<SOL> firstImprNeighborhoodExplorer(orderNeighborhood, eval);
-        opt::HillClimbing<SOL> hillClimbing(firstImprNeighborhoodExplorer, eval);
-        optNeighbor.init(tmp_sol);
-        hillClimbing.init(tmp_sol);
-        auto  initial_fitness = tmp_sol.fitness();
-        hillClimbing(tmp_sol,time_criterion);
-        auto new_fitness = tmp_sol.fitness();
-
-        if(new_fitness > initial_fitness){
-            std::cout << "fitness improved!" << std::endl;
-        }
-        bounded_archive(tmp_sol);
-    }
+    std::cout << "initial global diversity: " << global_diversity.recompute_all(bounded_archive) << std::endl;
+
+    opt::SelectAll<BOUNDED_ARCHIVE> *select = new opt::SelectAll<BOUNDED_ARCHIVE>();
+
+    representation::TwoOptNeighbor<SOL> twoOptNeighbor;
+    opt::RndWithoutRemplNeighborhood<SOL> rndWithoutRemplNeighborhood(twoOptNeighbor);
+    
+    opt::Neighborhood<SOL> *neighborhood = &rndWithoutRemplNeighborhood;
+
+    
+    opt::Explorer<BOUNDED_ARCHIVE> *explorer = new opt::NDomExplorer<BOUNDED_ARCHIVE>(*neighborhood, eval);
+    opt::ParetoLocalSearch<BOUNDED_ARCHIVE> *paretoLocalSearch = new opt::ParetoLocalSearch<BOUNDED_ARCHIVE>(*select, *explorer);
 
+    time_criterion.init();
+    paretoLocalSearch->operator()(bounded_archive, time_criterion);
     std::cout << "Final archive contains " << bounded_archive.size() << " solutions : " << std::endl;
     std::cout << bounded_archive << std::endl;
 
+    std::cout << "final global diversity: " << global_diversity.recompute_all(bounded_archive) << std::endl;
     std::cout << "Program ended!" << std::endl;
     return 0;
 }
\ No newline at end of file