Merge remote-tracking branch 'origin/main'

mateuszbaran · Feb 5, 2024 · 97baa3c · 97baa3c
2 parents ac5e705 + 0d4aa9a
commit 97baa3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           file: ./lcov.info
           name: codecov-umbrella

diff --git a/src/ImprovedHagerZhangLinesearch.jl b/src/ImprovedHagerZhangLinesearch.jl
@@ -18,7 +18,7 @@ using Manopt: max_stepsize, get_cost_function
 #       on the parameters
 
 mutable struct HagerZhangLinesearch{
-    T,TRM<:AbstractRetractionMethod,VTM<:AbstractVectorTransportMethod,P,TX
+    T<:Real,TRM<:AbstractRetractionMethod,VTM<:AbstractVectorTransportMethod,P,TX
 } <: Linesearch
     delta::T # c_1 Wolfe sufficient decrease condition
     sigma::T # c_2 Wolfe curvature condition (Recommend 0.1 for GradientDescent)
@@ -51,11 +51,11 @@ function HagerZhangLinesearch(
     gamma::T=0.66,
     linesearchmax::Int=50,
     psi3::T=0.1,
-) where {P,TRM<:AbstractRetractionMethod,VTM<:AbstractVectorTransportMethod,T,TX}
+) where {P,TRM<:AbstractRetractionMethod,VTM<:AbstractVectorTransportMethod,T<:Real,TX}
     return HagerZhangLinesearch{T,TRM,VTM,P,TX}(
         delta,
         sigma,
-        alphamax,
+        convert(T, alphamax),
         rho,
         epsilon,
         gamma,
@@ -124,6 +124,7 @@ function (ls::HagerZhangLinesearch)(ϕdϕ, c::T, phi_0::Real, dphi_0::Real) wher
         throw(ErrorException("Value and slope at step length = 0 must be finite."))
     end
     if dphi_0 >= eps(T) * abs(phi_0)
+        println("Values: $dphi_0, $(abs(phi_0))")
         throw(ErrorException("Search direction is not a direction of descent."))
     elseif dphi_0 >= 0
         return zeroT, phi_0