Fixing simulated annealing minimum iterations

UO-OACISS · Jul 11, 2023 · 47c3f6e · 47c3f6e
1 parent 1c60469
commit 47c3f6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
     }
 };