same for lmstr

note: hybrd,hybrj didn't have any failed cases in original minpack, but added the same code just for completeness.

Author: jacobwilliams

test/test_hybrd.f90

@@ -23,6 +23,10 @@ program test_hybrd
     integer,dimension(ncases),parameter :: ns = [2,4,2,4,3,6,9,5,6,7,8,9,10,30,40,10,1,10,10,10,10,10]
     integer,dimension(ncases),parameter :: ntriess = [3,3,2,3,3,2,2,3,3,3,1,1,3,1,1,3,3,3,3,3,3,3]
 
+    integer,dimension(55),parameter :: info_original = [1,1,1,4,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,&
+                                                        1,1,1,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,1,1,&
+                                                        1,1,1,1,1,1,1,1,1]
+
     integer :: i, ic, info, k, lwa, n, NFEv, NPRob, ntries, icase
     integer :: na(55), nf(55), np(55), nx(55)
     real(wp) :: fnm(55)
@@ -82,8 +86,9 @@ program test_hybrd
                 factor = ten*factor
 
                 ! compare with previously generated solutions:
-                if (any(abs( solution(ic) - x)>tol .and. &
-                        abs((solution(ic) - x)/(solution(ic))) > solution_reltol)) then
+                if (info_original(ic)<5 .and. &   ! ignore any where the original minpack failed
+                    any(abs( solution(ic) - x)>tol .and. &
+                    abs((solution(ic) - x)/(solution(ic))) > solution_reltol)) then
                     write(nwrite,'(A)') 'Failed case'
                     write(nwrite, '(//5x, a//(5x, 5d15.7))') 'Expected x: ', solution(ic)
                     write(nwrite, '(/5x, a//(5x, 5d15.7))')  'Computed x: ', x

test/test_hybrj.f90

@@ -23,6 +23,10 @@ program test_hybrj
     integer,dimension(ncases),parameter :: ns      = [2,4,2,4,3,6,9,5,6,7,8,9,10,30,40,10,1,10,10,10,10,10]
     integer,dimension(ncases),parameter :: ntriess = [3,3,2,3,3,2,2,3,3,3,1,1,3,1,1,3,3,3,3,3,3,3]
 
+    integer,dimension(55),parameter :: info_original = [1,1,1,4,4,4,1,1,1,1,1,1,1,1,1,1,1,4,1,1,1,1,1,&
+                                                        1,1,1,4,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,1,1,&
+                                                        1,1,1,1,1,1,1,1,1]
+
     integer :: i, ic, info, k, n, NFEv, NJEv, NPRob, ntries, icase, lwa, ldfjac
     integer :: na(55), nf(55), nj(55), np(55), nx(55)
     real(wp) :: fnm(55)
@@ -87,8 +91,9 @@ program test_hybrj
                 factor = ten*factor
 
                 ! compare with previously generated solutions:
-                if (any(abs( solution(ic) - x)>tol .and. &
-                        abs((solution(ic) - x)/(solution(ic))) > solution_reltol)) then
+                if (info_original(ic)<5 .and. &   ! ignore any where the original minpack failed
+                    any(abs( solution(ic) - x)>tol .and. &
+                    abs((solution(ic) - x)/(solution(ic))) > solution_reltol)) then
                     write(nwrite,'(A)') 'Failed case'
                     write(nwrite, '(//5x, a//(5x, 5d15.7))') 'Expected x: ', solution(ic)
                     write(nwrite, '(/5x, a//(5x, 5d15.7))')  'Computed x: ', x

test/test_lmstr.f90

@@ -24,6 +24,10 @@ program test_lmstr
     integer,dimension(ncases),parameter :: ms      = [10,50,10,50,10,50,2,3,4,2,15,11,16,31,31,31,10,10,20,8,8,9,10,10,30,40,33,65]
     integer,dimension(ncases),parameter :: ntriess = [1,1,1,1,1,1,3,3,3,3,3,3,2,3,3,3,1,1,3,3,1,1,1,3,1,1,1,1]
 
+    integer,dimension(53),parameter :: info_original = [2,3,1,1,1,1,4,2,2,2,2,2,4,4,4,1,1,1,1,1,1,1,1,5,3,5,&
+                                                        1,1,1,3,3,2,3,2,3,2,1,1,1,1,4,1,1,1,2,1,2,2,2,2,2,1,1]
+                                                        !! original `info` from the original minpack
+
     integer,dimension(:),allocatable :: iwa
     real(wp),dimension(:),allocatable :: wa
     real(wp),dimension(:,:),allocatable :: fjac
@@ -93,8 +97,9 @@ program test_lmstr
                 factor = ten*factor
 
                 ! compare with previously generated solutions:
-                if (any(abs( solution(ic) - x)>tol .and. &
-                        abs((solution(ic) - x)/(solution(ic))) > solution_reltol)) then
+                if (info_original(ic)<5 .and. &   ! ignore any where the original minpack failed
+                    any(abs( solution(ic) - x)>tol .and. &
+                    abs((solution(ic) - x)/(solution(ic))) > solution_reltol)) then
                     write(nwrite,'(A)') 'Failed case'
                     write(nwrite, '(//5x, a//(5x, 5d15.7))') 'Expected x: ', solution(ic)
                     write(nwrite, '(/5x, a//(5x, 5d15.7))')  'Computed x: ', x