Fix on CI

JuliaNLSolvers · Oct 25, 2024 · 5e63789 · 5e63789
1 parent b39e417
commit 5e63789
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/test/multivariate/solvers/first_order/momentum_gradient_descent.jl b/test/multivariate/solvers/first_order/momentum_gradient_descent.jl
@@ -4,7 +4,7 @@
             "Trigonometric", "Penalty Function I", "Beale","Paraboloid Random Matrix")
     run_optim_tests(MomentumGradientDescent(),
                     skip = skip,
-                    convergence_exceptions = (("Fletcher-Powell", 2),),
+                    convergence_exceptions = (("Fletcher-Powell", 1), ("Fletcher-Powell", 2),),
                     iteration_exceptions = (("Paraboloid Diagonal", 10000),
                                             ("Powell", 10000)),
                     f_increase_exceptions = ("Exponential", "Polynomial",

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -14,6 +14,7 @@ import LinearAlgebra: norm, diag, I, Diagonal, dot, eigen, issymmetric, mul!
 import SparseArrays: normalize!, spdiagm
 
 debug_printing = false
+test_broken = false
 
 special_tests = [
     "bigfloat/initial_convergence",
@@ -155,17 +156,17 @@ function run_optim_tests(method; convergence_exceptions = (),
                         printstyled(name, " did not converge with i = ", i, "\n", color=:red)
                         printstyled(results, "\n", color=:red)
                     end
-                else
+                elseif test_broken
                     @test_broken Optim.converged(results)
                 end
                 if !((name, i) in minimum_exceptions)
                     @test Optim.minimum(results) < prob.minimum + sqrt(eps(typeof(prob.minimum)))
-                else
+                elseif test_broken
                     @test_broken Optim.minimum(results) < prob.minimum + sqrt(eps(typeof(prob.minimum)))
                 end
                 if !((name, i) in minimizer_exceptions)
                     @test norm(Optim.minimizer(results) - prob.solutions) < 1e-2
-                else
+                elseif test_broken
                     @test_broken norm(Optim.minimizer(results) - prob.solutions) < 1e-2
                 end
             end
@@ -223,17 +224,17 @@ function run_optim_tests_constrained(method; convergence_exceptions = (),
                     printstyled(name, "did not converge\n", color=:red)
                     printstyled(results, "\n", color=:red)
                 end
-            else
+            elseif test_broken
                 @test_broken Optim.converged(results)
             end
             if !(name in minimum_exceptions)
                 @test Optim.minimum(results) < prob.minimum + sqrt(eps(typeof(prob.minimum)))
-            else
+            elseif test_broken
                 @test_broken Optim.minimum(results) < prob.minimum + sqrt(eps(typeof(prob.minimum)))
             end
             if !(name in minimizer_exceptions)
                 @test norm(Optim.minimizer(results) - prob.solutions) < 1e-2
-            else
+            elseif test_broken
                 @test_broken norm(Optim.minimizer(results) - prob.solutions) < 1e-2
             end
         else