Skip to content

Commit a994bf7

Browse files
jacobwilliamsjacobwilliams
committed
refactoring test cases.
Fixed issues in test_lmder.f90. See #6
1 parent ecd0511 commit a994bf7

File tree

6 files changed

+1068
-1065
lines changed

6 files changed

+1068
-1065
lines changed

‎test/test_chkder.f90‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ subroutine errjac(n,x,Fjac,Ldfjac,Nprob)
128128
!
129129
! SUBPROGRAMS CALLED
130130
!
131-
! FORTRAN-SUPPLIED ... DATAN,DCOS,DEXP,DMIN1,DSIN,DSQRT,
131+
! FORTRAN-SUPPLIED ... atan,cos,exp,DMIN1,sin,sqrt,
132132
! MAX0,MIN0
133133
!
134134
! ARGONNE NATIONAL LABORATORY. MINPACK PROJECT. MARCH 1980.
@@ -178,8 +178,8 @@ subroutine errjac(n,x,Fjac,Ldfjac,Nprob)
178178
!
179179
Fjac(1,1) = -c1*x(2)
180180
Fjac(1,2) = -c1*x(1)
181-
Fjac(2,1) = dexp(-x(1))
182-
Fjac(2,2) = dexp(-x(2))
181+
Fjac(2,1) = exp(-x(1))
182+
Fjac(2,2) = exp(-x(2))
183183
case (4)
184184
!
185185
! WOOD FUNCTION WITHOUT ERROR.
@@ -206,7 +206,7 @@ subroutine errjac(n,x,Fjac,Ldfjac,Nprob)
206206
! HELICAL VALLEY FUNCTION WITH MULTIPLICATIVE ERROR AFFECTING
207207
! ELEMENTS (2,1) AND (2,2).
208208
!
209-
tpi = eight*datan(one)
209+
tpi = eight*atan(one)
210210
temp = x(1)**2 + x(2)**2
211211
temp1 = tpi*temp
212212
temp2 = sqrt(temp)
@@ -346,11 +346,11 @@ subroutine errjac(n,x,Fjac,Ldfjac,Nprob)
346346
! OFFDIAGONAL ELEMENTS OF THE JACOBIAN.
347347
!
348348
do j = 1 , n
349-
temp = dsin(x(j))
349+
temp = sin(x(j))
350350
do k = 1 , n
351351
Fjac(k,j) = -temp
352352
enddo
353-
Fjac(j,j) = dfloat(j+1)*temp - dcos(x(j))
353+
Fjac(j,j) = dfloat(j+1)*temp - cos(x(j))
354354
enddo
355355
case (12)
356356
!
@@ -604,7 +604,7 @@ subroutine vecfcn(n,x,Fvec,Nprob)
604604
!
605605
! SUBPROGRAMS CALLED
606606
!
607-
! FORTRAN-SUPPLIED ... DATAN,DCOS,DEXP,DSIGN,DSIN,DSQRT,
607+
! FORTRAN-SUPPLIED ... atan,cos,exp,sign,sin,sqrt,
608608
! MAX0,MIN0
609609
!
610610
! ARGONNE NATIONAL LABORATORY. MINPACK PROJECT. MARCH 1980.
@@ -639,7 +639,7 @@ subroutine vecfcn(n,x,Fvec,Nprob)
639639
! POWELL BADLY SCALED FUNCTION.
640640
!
641641
Fvec(1) = c1*x(1)*x(2) - one
642-
Fvec(2) = dexp(-x(1)) + dexp(-x(2)) - c2
642+
Fvec(2) = exp(-x(1)) + exp(-x(2)) - c2
643643
case (4)
644644
!
645645
! WOOD FUNCTION.
@@ -654,10 +654,10 @@ subroutine vecfcn(n,x,Fvec,Nprob)
654654
!
655655
! HELICAL VALLEY FUNCTION.
656656
!
657-
tpi = eight*datan(one)
658-
temp1 = dsign(c7,x(2))
659-
if ( x(1)>zero ) temp1 = datan(x(2)/x(1))/tpi
660-
if ( x(1)<zero ) temp1 = datan(x(2)/x(1))/tpi + c8
657+
tpi = eight*atan(one)
658+
temp1 = sign(c7,x(2))
659+
if ( x(1)>zero ) temp1 = atan(x(2)/x(1))/tpi
660+
if ( x(1)<zero ) temp1 = atan(x(2)/x(1))/tpi + c8
661661
temp2 = sqrt(x(1)**2+x(2)**2)
662662
Fvec(1) = ten*(x(3)-ten*temp1)
663663
Fvec(2) = ten*(temp2-one)
@@ -776,11 +776,11 @@ subroutine vecfcn(n,x,Fvec,Nprob)
776776
!
777777
sum = zero
778778
do j = 1 , n
779-
Fvec(j) = dcos(x(j))
779+
Fvec(j) = cos(x(j))
780780
sum = sum + Fvec(j)
781781
enddo
782782
do k = 1 , n
783-
Fvec(k) = dfloat(n+k) - dsin(x(k)) - sum - dfloat(k)*Fvec(k)
783+
Fvec(k) = dfloat(n+k) - sin(x(k)) - sum - dfloat(k)*Fvec(k)
784784
enddo
785785
case (12)
786786
!

‎test/test_hybrd.f90‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ program test
2121
!
2222
! MINPACK-SUPPLIED ... DPMPAR,ENORM,HYBRD1,INITPT,VECFCN
2323
!
24-
! FORTRAN-SUPPLIED ... DSQRT
24+
! FORTRAN-SUPPLIED ... sqrt
2525
!
2626
! ARGONNE NATIONAL LABORATORY. MINPACK PROJECT. MARCH 1980.
2727
! BURTON S. GARBOW, KENNETH E. HILLSTROM, JORGE J. MORE
@@ -150,7 +150,7 @@ subroutine vecfcn(n,x,Fvec,Nprob)
150150
!
151151
! SUBPROGRAMS CALLED
152152
!
153-
! FORTRAN-SUPPLIED ... DATAN,DCOS,DEXP,DSIGN,DSIN,DSQRT,
153+
! FORTRAN-SUPPLIED ... atan,cos,exp,sign,sin,sqrt,
154154
! MAX0,MIN0
155155
!
156156
! ARGONNE NATIONAL LABORATORY. MINPACK PROJECT. MARCH 1980.
@@ -185,7 +185,7 @@ subroutine vecfcn(n,x,Fvec,Nprob)
185185
! POWELL BADLY SCALED FUNCTION.
186186
!
187187
Fvec(1) = c1*x(1)*x(2) - one
188-
Fvec(2) = dexp(-x(1)) + dexp(-x(2)) - c2
188+
Fvec(2) = exp(-x(1)) + exp(-x(2)) - c2
189189
case (4)
190190
!
191191
! WOOD FUNCTION.
@@ -200,10 +200,10 @@ subroutine vecfcn(n,x,Fvec,Nprob)
200200
!
201201
! HELICAL VALLEY FUNCTION.
202202
!
203-
tpi = eight*datan(one)
204-
temp1 = dsign(c7,x(2))
205-
if ( x(1)>zero ) temp1 = datan(x(2)/x(1))/tpi
206-
if ( x(1)<zero ) temp1 = datan(x(2)/x(1))/tpi + c8
203+
tpi = eight*atan(one)
204+
temp1 = sign(c7,x(2))
205+
if ( x(1)>zero ) temp1 = atan(x(2)/x(1))/tpi
206+
if ( x(1)<zero ) temp1 = atan(x(2)/x(1))/tpi + c8
207207
temp2 = sqrt(x(1)**2+x(2)**2)
208208
Fvec(1) = ten*(x(3)-ten*temp1)
209209
Fvec(2) = ten*(temp2-one)
@@ -322,11 +322,11 @@ subroutine vecfcn(n,x,Fvec,Nprob)
322322
!
323323
sum = zero
324324
do j = 1 , n
325-
Fvec(j) = dcos(x(j))
325+
Fvec(j) = cos(x(j))
326326
sum = sum + Fvec(j)
327327
enddo
328328
do k = 1 , n
329-
Fvec(k) = dfloat(n+k) - dsin(x(k)) - sum - dfloat(k)*Fvec(k)
329+
Fvec(k) = dfloat(n+k) - sin(x(k)) - sum - dfloat(k)*Fvec(k)
330330
enddo
331331
case (12)
332332
!

‎test/test_hybrj.f90‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ program test
2121
!
2222
! MINPACK-SUPPLIED ... DPMPAR,ENORM,HYBRJ1,INITPT,VECFCN
2323
!
24-
! FORTRAN-SUPPLIED ... DSQRT
24+
! FORTRAN-SUPPLIED ... sqrt
2525
!
2626
! ARGONNE NATIONAL LABORATORY. MINPACK PROJECT. MARCH 1980.
2727
! BURTON S. GARBOW, KENNETH E. HILLSTROM, JORGE J. MORE
@@ -159,7 +159,7 @@ subroutine vecjac(n,x,Fjac,Ldfjac,Nprob)
159159
!
160160
! SUBPROGRAMS CALLED
161161
!
162-
! FORTRAN-SUPPLIED ... DATAN,DCOS,DEXP,DMIN1,DSIN,DSQRT,
162+
! FORTRAN-SUPPLIED ... atan,cos,exp,DMIN1,sin,sqrt,
163163
! MAX0,MIN0
164164
!
165165
! ARGONNE NATIONAL LABORATORY. MINPACK PROJECT. MARCH 1980.
@@ -207,8 +207,8 @@ subroutine vecjac(n,x,Fjac,Ldfjac,Nprob)
207207
!
208208
Fjac(1,1) = c1*x(2)
209209
Fjac(1,2) = c1*x(1)
210-
Fjac(2,1) = -dexp(-x(1))
211-
Fjac(2,2) = -dexp(-x(2))
210+
Fjac(2,1) = -exp(-x(1))
211+
Fjac(2,2) = -exp(-x(2))
212212
case (4)
213213
!
214214
! WOOD FUNCTION.
@@ -234,7 +234,7 @@ subroutine vecjac(n,x,Fjac,Ldfjac,Nprob)
234234
!
235235
! HELICAL VALLEY FUNCTION.
236236
!
237-
tpi = eight*datan(one)
237+
tpi = eight*atan(one)
238238
temp = x(1)**2 + x(2)**2
239239
temp1 = tpi*temp
240240
temp2 = sqrt(temp)
@@ -370,11 +370,11 @@ subroutine vecjac(n,x,Fjac,Ldfjac,Nprob)
370370
! TRIGONOMETRIC FUNCTION.
371371
!
372372
do j = 1 , n
373-
temp = dsin(x(j))
373+
temp = sin(x(j))
374374
do k = 1 , n
375375
Fjac(k,j) = temp
376376
enddo
377-
Fjac(j,j) = dfloat(j+1)*temp - dcos(x(j))
377+
Fjac(j,j) = dfloat(j+1)*temp - cos(x(j))
378378
enddo
379379
case (12)
380380
!
@@ -626,7 +626,7 @@ subroutine vecfcn(n,x,Fvec,Nprob)
626626
!
627627
! SUBPROGRAMS CALLED
628628
!
629-
! FORTRAN-SUPPLIED ... DATAN,DCOS,DEXP,DSIGN,DSIN,DSQRT,
629+
! FORTRAN-SUPPLIED ... atan,cos,exp,sign,sin,sqrt,
630630
! MAX0,MIN0
631631
!
632632
! ARGONNE NATIONAL LABORATORY. MINPACK PROJECT. MARCH 1980.
@@ -661,7 +661,7 @@ subroutine vecfcn(n,x,Fvec,Nprob)
661661
! POWELL BADLY SCALED FUNCTION.
662662
!
663663
Fvec(1) = c1*x(1)*x(2) - one
664-
Fvec(2) = dexp(-x(1)) + dexp(-x(2)) - c2
664+
Fvec(2) = exp(-x(1)) + exp(-x(2)) - c2
665665
case (4)
666666
!
667667
! WOOD FUNCTION.
@@ -676,10 +676,10 @@ subroutine vecfcn(n,x,Fvec,Nprob)
676676
!
677677
! HELICAL VALLEY FUNCTION.
678678
!
679-
tpi = eight*datan(one)
680-
temp1 = dsign(c7,x(2))
681-
if ( x(1)>zero ) temp1 = datan(x(2)/x(1))/tpi
682-
if ( x(1)<zero ) temp1 = datan(x(2)/x(1))/tpi + c8
679+
tpi = eight*atan(one)
680+
temp1 = sign(c7,x(2))
681+
if ( x(1)>zero ) temp1 = atan(x(2)/x(1))/tpi
682+
if ( x(1)<zero ) temp1 = atan(x(2)/x(1))/tpi + c8
683683
temp2 = sqrt(x(1)**2+x(2)**2)
684684
Fvec(1) = ten*(x(3)-ten*temp1)
685685
Fvec(2) = ten*(temp2-one)
@@ -798,11 +798,11 @@ subroutine vecfcn(n,x,Fvec,Nprob)
798798
!
799799
sum = zero
800800
do j = 1 , n
801-
Fvec(j) = dcos(x(j))
801+
Fvec(j) = cos(x(j))
802802
sum = sum + Fvec(j)
803803
enddo
804804
do k = 1 , n
805-
Fvec(k) = dfloat(n+k) - dsin(x(k)) - sum - dfloat(k)*Fvec(k)
805+
Fvec(k) = dfloat(n+k) - sin(x(k)) - sum - dfloat(k)*Fvec(k)
806806
enddo
807807
case (12)
808808
!

0 commit comments

Comments
 (0)