Add safeguard for expansion factor

lingyaw · Nov 22, 2016 · bb0aa25 · bb0aa25
1 parent 12051c0
commit bb0aa25
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/FieldOpt/Optimization/optimizers/GSS.cpp b/FieldOpt/Optimization/optimizers/GSS.cpp
@@ -35,7 +35,9 @@ namespace Optimization {
                 std::cout << ("WARNING: Compass search does not handle both continuous and discrete variables at the same time");
 
             contr_fac_ = settings->parameters().contraction_factor;
-            expan_fac_ = settings->parameters().expansion_factor;
+
+            if (settings->parameters().expansion_factor >= 1.0)
+                expan_fac_ = settings->parameters().expansion_factor;
             step_tol_ = settings->parameters().minimum_step_length;
 
             assert(step_lengths_.size() == directions_.size());