Merge pull request #98 from JuliaNLSolvers/fixinstat

Fix InitialStatic bug

Author: anriseth

src/initialguess.jl

@@ -13,10 +13,12 @@ is scaled with the `l_2` norm of the step direction.
 end
 
 function (is::InitialStatic{T})(ls, state, phi_0, dphi_0, df) where T
-    state.alpha = is.alpha
-    if is.scaled == true && (ns = vecnorm(state.s)) > zero(T)
-        # TODO: Type instability if there's a type mismatch between is.alpha and ns
-        state.alpha *= min(is.alpha, ns) / ns
+    PT = promote_type(T, eltype(state.s))
+    if is.scaled == true && (ns = vecnorm(state.s)) > zero(PT)
+        # TODO: Type instability if there's a type mismatch between is.alpha and ns?
+        state.alpha = PT(min(is.alpha, ns)) / ns
+    else
+        state.alpha = PT(is.alpha)
     end
 end
 

test/initial.jl

@@ -43,7 +43,12 @@
     state = getstate()
     is = InitialStatic(alpha = 0.5, scaled = true)
     is(ls, state, phi_0, dphi_0, df)
-    @test state.alpha == 0.08838834764831843
+    @test state.alpha == 0.5 / vecnorm(state.s)
+    @test ls.mayterminate[] == false
+    is = InitialStatic(alpha = 0.5, scaled = true)
+    state.s .= (is.alpha / 100)
+    is(ls, state, phi_0, dphi_0, df)
+    @test state.alpha ==  1.0
     @test ls.mayterminate[] == false
 
     # Test Previous