hotfix

src/diom.jl

@@ -28,8 +28,8 @@ This implementation allows a left preconditioner M and a right preconditioner N.
 function diom(A :: AbstractLinearOperator, b :: AbstractVector{T};
               M :: AbstractLinearOperator=opEye(),
               N :: AbstractLinearOperator=opEye(),
-              atol :: T=√eps(T), rtol :: T=√eps(T), itmax :: Int=0, memory :: Int=20,
-              verbose :: Bool=false) where T <: AbstractFloat
+              atol :: T=√eps(T), rtol :: T=√eps(T), itmax :: Int=0,
+              memory :: Int=20, verbose :: Bool=false) where T <: AbstractFloat
 
   m, n = size(A)
   m == n || error("System must be square")

src/dqgmres.jl

@@ -25,8 +25,9 @@ This implementation allows a left preconditioner M and a right preconditioner N.
 """
 function dqgmres(A :: AbstractLinearOperator, b :: AbstractVector{T};
                  M :: AbstractLinearOperator=opEye(),
-                 atol :: T=√eps(T), rtol :: T=√eps(T), itmax :: Int=0, memory :: Int=20,
-                 verbose :: Bool=false) where T <: AbstractFloat
+                 N :: AbstractLinearOperator=opEye(),
+                 atol :: T=√eps(T), rtol :: T=√eps(T), itmax :: Int=0,
+                 memory :: Int=20, verbose :: Bool=false) where T <: AbstractFloat
 
   m, n = size(A)
   m == n || error("System must be square")

test/test_mp.jl

@@ -5,7 +5,7 @@ function test_mp()
              :dqgmres, :diom, :cr, :lslq, :lsqr, :lsmr, :craig,
              :craigmr, :crls, :symmlq, :minres, :cg_lanczos_shift_seq,
              :bilq, :minres_qlp)
-    @printf("%10s ", string(fn))
+    @printf("%s ", string(fn))
     for T in (Float16, Float32, Float64, BigFloat)
       M = spdiagm(-1 => -ones(T,n-1), 0 => 3*ones(T,n), 1 => -ones(T,n-1))
       A = LinearOperator(M)
@@ -16,18 +16,13 @@ function test_mp()
         shifts = [λ]
         xs = @eval $fn($A, $b, $shifts)[1]
         x = xs[1]
+      elseif fn == :usymqr
+        x = @eval $fn($A, $b, $c)[1]
       else
         x = @eval $fn($A, $b)[1]
       end
       atol = √eps(T)
       rtol = √eps(T)
-      if fn == :usymqr
-        (x, stats) = @eval $fn($A, $b, $c)
-      else
-        (x, stats) = @eval $fn($A, $b)
-      end
-      @test norm(A * x - b) ≤ atol + norm(b) * rtol
-    end
       if T == Float16
         @test norm(A * x - b) ≤ 10 * (atol + norm(b) * rtol)
       else

test/test_variants.jl

@@ -1,6 +1,6 @@
 # Tests of variants.jl
 function test_variants()
-  @printf("\nTests of variants:\n")
+  @printf("Tests of variants:\n")
   for fn in (:cg_lanczos, :cg_lanczos_shift_seq, :cg, :cgls, :cgne,
              :cr, :craig, :craigmr, :crls, :crmr, :lslq, :lsmr, :bilq,
              :lsqr, :minres, :symmlq, :dqgmres, :diom, :cgs, :usymqr,