diff --git a/src/apex/simulated_annealing.cpp b/src/apex/simulated_annealing.cpp index a9449c3a..08669171 100644 --- a/src/apex/simulated_annealing.cpp +++ b/src/apex/simulated_annealing.cpp @@ -32,7 +32,7 @@ size_t SimulatedAnnealing::get_max_iterations() { } //return max_iter / vars.size(); //return max_iter * vars.size() *vars.size(); - return std::min(max_iterations, (std::max(min_iterations, max_iter))); + return std::min(max_iterations, (std::max(min_iterations, max_iter*max_iter))); } double SimulatedAnnealing::acceptance_probability(double new_cost) { diff --git a/src/apex/simulated_annealing.hpp b/src/apex/simulated_annealing.hpp index ce6f2f68..6f511b3c 100644 --- a/src/apex/simulated_annealing.hpp +++ b/src/apex/simulated_annealing.hpp @@ -187,7 +187,7 @@ class SimulatedAnnealing { vars.insert(std::make_pair(name, var)); kmax = get_max_iterations(); /* get max iterations */ - //std::cout << "Max iterations : " << kmax << std::endl; + //std::cout << vars.size() << " Vars, Max iterations : " << kmax << std::endl; restart = kmax / 10; } };