231013.142925.HKT norma: revise fortran/uobyqa/geometry.f90

fortran/bobyqa/geometry.f90

@@ -8,7 +8,7 @@ module geometry_bobyqa_mod
 !
 ! Started: February 2022
 !
-! Last Modified: Wednesday, October 11, 2023 PM08:36:51
+! Last Modified: Friday, October 13, 2023 PM02:27:42
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -185,8 +185,8 @@ function geostep(knew, kopt, bmat, delbar, sl, su, xpt, zmat) result(d)
 !   satisfies the SL, SU and trust region bounds and it should provide a large denominator in the
 !   next call of UPDATE. The step XLINE-XOPT from XOPT is restricted to moves along the straight
 !   lines through XOPT and another interpolation point.
-! XCAUCHY also provides a large value of the modulus of the KNEW-th Lagrange function subject to
-!   the constraints that have been mentioned, its main difference from XLINE being that XCAUCHY-XOPT
+! XCAUCHY provides a large value of the modulus of the KNEW-th Lagrange function subject to the
+!   constraints that have been mentioned, its main difference from XLINE being that XCAUCHY-XOPT
 !   is a bound-constrained version of the Cauchy step within the trust region.
 !--------------------------------------------------------------------------------------------------!
 

fortran/uobyqa/geometry.f90

@@ -8,7 +8,7 @@ module geometry_uobyqa_mod
 !
 ! Started: February 2022
 !
-! Last Modified: Wednesday, October 04, 2023 PM11:23:35
+! Last Modified: Friday, October 13, 2023 PM02:22:55
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -429,7 +429,7 @@ function geostep(knew, kopt, delbar, pl, xpt) result(d)
 ! entries of VLAG and VLAGC are needed.
 vlag = calvlag(pl, d, xopt, kopt)
 vlagc = calvlag(pl, dcauchy, xopt, kopt)
-if (is_nan(sum(abs(d))) .or. abs(vlagc(knew)) > TWO * abs(vlag(knew))) then
+if (abs(vlagc(knew)) > TWO * abs(vlag(knew)) .or. is_nan(vlag(knew))) then
     d = dcauchy
 end if