fix major bug in CG

Jutho · Sep 3, 2020 · f3891c9 · f3891c9 · Jutho · Sep 3, 2020
1 parent 7b325c1
commit f3891c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "OptimKit"
 uuid = "77e91f04-9b3b-57a6-a776-40b61faaebe0"
 authors = ["Jutho Haegeman"]
-version = "0.1.0"
+version = "0.2.0"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

diff --git a/src/cg.jl b/src/cg.jl
@@ -83,9 +83,6 @@ function optimize(fg, x, alg::ConjugateGradient;
             @info @sprintf("CG: iter %4d: f = %.12f, ‖∇f‖ = %.4e, α = %.2e, β = %.2e, nfg = %d",
                             numiter, f, normgrad, α, β, nfg)
 
-        # increase α for next step
-        α = 2*α
-
         # transport gprev, ηprev and vectors in Hessian approximation to x
         gprev = transport!(gprev, xprev, ηprev, α, x)
         if precondition === _precondition
@@ -94,6 +91,9 @@ function optimize(fg, x, alg::ConjugateGradient;
             Pgprev = transport!(Pgprev, xprev, ηprev, α, x)
         end
         ηprev = transport!(deepcopy(ηprev), xprev, ηprev, α, x)
+
+        # increase α for next step
+        α = 2*α
     end
     if verbosity > 0
         if normgrad <= alg.gradtol