Fix bugs.

Update tests.
gha3mi · Jul 9, 2023 · ef873b4 · ef873b4
1 parent 30f563b
commit ef873b4
Show file tree

Hide file tree

Showing 12 changed files with 119 additions and 127 deletions.
diff --git a/ford.yml b/ford.yml
@@ -1,5 +1,5 @@
 project:             forsolver
-version:             v0.3.0
+version:             v0.3.1
 year:                2023
 project_github:      https://github.com/gha3mi/forsolver
 author:              Seyed Ali Ghasemi

diff --git a/fpm.toml b/fpm.toml
@@ -1,5 +1,5 @@
 name = "forsolver"
-version = "0.3.0"
+version = "0.3.1"
 author = "Seyed Ali Ghasemi"
 maintainer = "info@gha3mi.com"
 copyright = "Copyright (c) 2023, Seyed Ali Ghasemi"
@@ -20,70 +20,70 @@ source-form = "free"
 kinds = {git="https://github.com/gha3mi/kinds.git"}
 fordiff = {git="https://github.com/gha3mi/fordiff.git"}
 
-[[test]]
-name       = "test1"
-source-dir = "test"
-main       = "test1.f90"
+# [[test]]
+# name       = "test1"
+# source-dir = "test"
+# main       = "test1.f90"
 
-[[test]]
-name       = "test2"
-source-dir = "test"
-main       = "test2.f90"
+# [[test]]
+# name       = "test2"
+# source-dir = "test"
+# main       = "test2.f90"
 
-[[test]]
-name       = "test3"
-source-dir = "test"
-main       = "test3.f90"
+# [[test]]
+# name       = "test3"
+# source-dir = "test"
+# main       = "test3.f90"
 
-[[test]]
-name       = "test4"
-source-dir = "test"
-main       = "test4.f90"
+# [[test]]
+# name       = "test4"
+# source-dir = "test"
+# main       = "test4.f90"
 
-[[test]]
-name       = "test5"
-source-dir = "test"
-main       = "test5.f90"
+# [[test]]
+# name       = "test5"
+# source-dir = "test"
+# main       = "test5.f90"
 
-[[test]]
-name       = "test6"
-source-dir = "test"
-main       = "test6.f90"
+# [[test]]
+# name       = "test6"
+# source-dir = "test"
+# main       = "test6.f90"
 
-[[test]]
-name       = "test7"
-source-dir = "test"
-main       = "test7.f90"
+# [[test]]
+# name       = "test7"
+# source-dir = "test"
+# main       = "test7.f90"
 
-[[test]]
-name       = "test8"
-source-dir = "test"
-main       = "test8.f90"
+# [[test]]
+# name       = "test8"
+# source-dir = "test"
+# main       = "test8.f90"
 
-[[test]]
-name       = "test9"
-source-dir = "test"
-main       = "test9.f90"
+# [[test]]
+# name       = "test9"
+# source-dir = "test"
+# main       = "test9.f90"
 
-[[test]]
-name       = "test10"
-source-dir = "test"
-main       = "test10.f90"
+# [[test]]
+# name       = "test10"
+# source-dir = "test"
+# main       = "test10.f90"
 
-[[test]]
-name       = "test11"
-source-dir = "test"
-main       = "test11.f90"
+# [[test]]
+# name       = "test11"
+# source-dir = "test"
+# main       = "test11.f90"
 
-[[test]]
-name       = "test12"
-source-dir = "test"
-main       = "test12.f90"
+# [[test]]
+# name       = "test12"
+# source-dir = "test"
+# main       = "test12.f90"
 
-[[test]]
-name       = "test13"
-source-dir = "test"
-main       = "test13.f90"
+# [[test]]
+# name       = "test13"
+# source-dir = "test"
+# main       = "test13.f90"
 
 [[test]]
 name       = "test14"

diff --git a/src/forsolver.f90 b/src/forsolver.f90
@@ -210,7 +210,7 @@ end function dFun
       if (this%verbosity == 1) then
          print '(a)', '-----------------------------------------------'
          print '(a)', 'maxit             x0                   tol'
-         print '(i3, 10x, f12.8, 10x, e12.4)', this%maxit, x0, this%TolFun
+         print '(i5, 10x, f12.8, 10x, e12.4)', this%maxit, x0, this%TolFun
          print '(a)', '-----------------------------------------------'
          print '(a)', 'start newton'
          print '(a)', '-----------------------------------------------'
@@ -261,8 +261,8 @@ impure function dFun(x)
          end function dFun
       end interface
 
-      procedure(Fun)  :: F
-      procedure(dFun) :: dFdx
+      procedure(Fun)            :: F
+      procedure(dFun), optional :: dFdx
 
       class(nlsolver),               intent(inout) :: this
       real(rk), dimension(:),        intent(in)    :: x0
@@ -272,7 +272,7 @@ end function dFun
       if (this%verbosity == 1) then
          print '(a)', '-----------------------------------------------'
          print '(a)', 'maxit             tol'
-         print '(i3, 10x, e12.4)', this%maxit, this%TolFun
+         print '(i5, 10x, e12.4)', this%maxit, this%TolFun
          print '(a)', '-----------------------------------------------'
          print '(a)', 'start newton'
          print '(a)', '-----------------------------------------------'
@@ -327,7 +327,7 @@ end function Fun
       if (this%verbosity == 1) then
          print '(a)', '-----------------------------------------------'
          print '(a)', 'maxit             x0                   tol'
-         print '(i3, 10x, f12.8, 10x, e12.4)', this%maxit, real(x0, kind=rk), this%TolFun
+         print '(i5, 10x, f12.8, 10x, e12.4)', this%maxit, real(x0, kind=rk), this%TolFun
          print '(a)', '-----------------------------------------------'
          print '(a)', 'start newton'
          print '(a)', '-----------------------------------------------'
@@ -373,7 +373,7 @@ end function Fun
       if (this%verbosity == 1) then
          print '(a)', '-----------------------------------------------'
          print '(a)', 'maxit             tol'
-         print '(i3, 10x, f12.8, e12.4)', this%maxit, this%TolFun
+         print '(i5, 10x, f12.8, e12.4)', this%maxit, this%TolFun
          print '(a)', '-----------------------------------------------'
          print '(a)', 'start newton'
          print '(a)', '-----------------------------------------------'
@@ -537,7 +537,7 @@ end function dFun
          criteriaFun = abs(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
+            print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -598,7 +598,7 @@ end function dFun
          criteriaFun = abs(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
+            print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -654,7 +654,7 @@ end function Fun
          criteriaFun = abs(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
+            print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -710,7 +710,7 @@ end function Fun
          criteriaFun = abs(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
+            print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -771,7 +771,7 @@ end function dFun
          criteriaFun = norm2(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, e12.4)', k, criteriaFun
+            print '(i5, e12.4)', k, criteriaFun
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -832,7 +832,7 @@ end function dFun
          criteriaFun = norm2(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, e12.4)', k, criteriaFun
+            print '(i5, e12.4)', k, criteriaFun
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -886,7 +886,7 @@ end function Fun
          criteriaFun = norm2(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, e12.4)', k, criteriaFun
+            print '(i5, e12.4)', k, criteriaFun
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -941,7 +941,7 @@ end function Fun
          criteriaFun = norm2(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, e12.4)', k, criteriaFun
+            print '(i5, e12.4)', k, criteriaFun
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -996,7 +996,7 @@ end function Fun
          criteriaFun = abs(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, f12.4, 4x, e12.4, 4x, e12.4)', k, real(xk, kind=rk), real(F_val, kind=rk), dFdx_val
+            print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, real(xk, kind=rk), real(F_val, kind=rk), dFdx_val
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -1050,7 +1050,7 @@ end function Fun
          criteriaFun = abs(F_val)
 
          if (this%verbosity == 1) then
-            print '(i3, f12.4, 4x, e12.4, 4x, e12.4)', k, real(xk, kind=rk), real(F_val, kind=rk), dFdx_val
+            print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, real(xk, kind=rk), real(F_val, kind=rk), dFdx_val
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -1104,7 +1104,7 @@ end function Fun
          criteriaFun = norm2(real(F_val, kind=rk))
 
          if (this%verbosity == 1) then
-            print '(i3, e12.4)', k, criteriaFun
+            print '(i5, e12.4)', k, criteriaFun
          end if
 
          if (criteriaFun <= this%TolFun) then
@@ -1158,7 +1158,7 @@ end function Fun
          criteriaFun = norm2(real(F_val, kind=rk))
 
          if (this%verbosity == 1) then
-            print '(i3, e12.4)', k, criteriaFun
+            print '(i5, e12.4)', k, criteriaFun
          end if
 
          if (criteriaFun <= this%TolFun) then

diff --git a/test/test10.f90 b/test/test10.f90
@@ -7,15 +7,15 @@ program test10
    implicit none
 
    type(nlsolver)         :: nls
-   real(rk), dimension(3) :: x_sol
+   real(rk), dimension(2) :: x_sol
 
    call nls%set_options(&
       nl_method   = 'newton-modified',&
-      nmp         = 2,&
+      nmp         = 1,&
       maxit       = 100,&
-      TolFun      = 1e-12_rk,&
+      TolFun      = 1e-15_rk,&
       verbosity   = 1)
 
-   call nls%solve(F=F3, dFdx=dF3dx, x0=[5.0_rk,3.0_rk,1.0_rk], x_sol=x_sol)
+      call nls%solve(F=F3, dFdx=dF3dx, x0=[-1.0_rk,-1.0_rk], x_sol=x_sol)
 
 end program test10
diff --git a/test/test11.f90 b/test/test11.f90
@@ -7,16 +7,16 @@ program test11
    implicit none
 
    type(nlsolver)         :: nls
-   real(rk), dimension(3) :: x_sol
+   real(rk), dimension(2) :: x_sol
 
    call nls%set_options(&
       nl_method   = 'newton-quasi-fd',&
       fdm_method  = 'central',&
-      fdm_tol     = 1e-8_rk,&
-      maxit       = 100,&
-      TolFun      = 1e-12_rk,&
+      fdm_tol     = 1e-6_rk,&
+      maxit       = 1000000,&
+      TolFun      = 1e-13_rk,&
       verbosity   = 1)
 
-   call nls%solve(F=F3, dFdx=dF3dx, x0=[5.0_rk,3.0_rk,1.0_rk], x_sol=x_sol)
+      call nls%solve(F=F3, x0=[-1.0_rk,-1.0_rk], x_sol=x_sol)
 
 end program test11
diff --git a/test/test12.f90 b/test/test12.f90
@@ -7,17 +7,17 @@ program test12
    implicit none
 
    type(nlsolver)         :: nls
-   real(rk), dimension(3) :: x_sol
+   real(rk), dimension(2) :: x_sol
 
    call nls%set_options(&
       nl_method   = 'newton-quasi-fd-modified',&
       fdm_method  = 'central',&
-      fdm_tol     = 1e-8_rk,&
-      nmp         = 2,&
-      maxit       = 100,&
-      TolFun      = 1e-12_rk,&
+      fdm_tol     = 1e-6_rk,&
+      nmp         = 1,&
+      maxit       = 1000000,&
+      TolFun      = 1e-13_rk,&
       verbosity   = 1)
 
-   call nls%solve(F=F3, dFdx=dF3dx, x0=[5.0_rk,3.0_rk,1.0_rk], x_sol=x_sol)
+      call nls%solve(F=F3, x0=[-1.0_rk,-1.0_rk], x_sol=x_sol)
 
 end program test12
diff --git a/test/test13.f90 b/test/test13.f90
@@ -7,15 +7,15 @@ program test13
    implicit none
 
    type(nlsolver)            :: nls
-   complex(rk), dimension(3) :: x_sol
+   complex(rk), dimension(2) :: x_sol
 
    call nls%set_options(&
       nl_method   = 'newton-quasi-cs',&
       cs_tol      = 1e-200_rk,&
-      maxit       = 100,&
-      TolFun      = 1e-15_rk,&
+      maxit       = 10800,&
+      TolFun      = 1e-13_rk,&
       verbosity   = 1)
 
-   call nls%solve(F=F4, x0=[(5.0_rk,0.0_rk) ,(3.0_rk,0.0_rk), (1.0_rk,0.0_rk)], x_sol=x_sol)
+   call nls%solve(F=F4, x0=[(-1.0_rk,0.0_rk) ,(-1.0_rk,0.0_rk)], x_sol=x_sol)
 
 end program test13