From 49070a92ca5be0552864e4fc1b791624af99981f Mon Sep 17 00:00:00 2001
From: zaikunzhang <zaikunzhang@gmail.com>
Date: Tue, 23 Jan 2024 21:07:34 +0800
Subject: [PATCH] 240123.210734.HKT relax the assertion about `vmultc >= 0`

---
 .development                   |  2 +-
 fortran/cobyla/trustregion.f90 | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.development b/.development
index e9054d4e4d..fc3d574e9e 160000
--- a/.development
+++ b/.development
@@ -1 +1 @@
-Subproject commit e9054d4e4df66b881bd9df71ca8c30a613506a77
+Subproject commit fc3d574e9e4f34fa9178030ee5b5da1a58b54ec6
diff --git a/fortran/cobyla/trustregion.f90 b/fortran/cobyla/trustregion.f90
index 31068c2149..8e62bef4c6 100644
--- a/fortran/cobyla/trustregion.f90
+++ b/fortran/cobyla/trustregion.f90
@@ -8,7 +8,7 @@ module trustregion_cobyla_mod
 !
 ! Started: June 2021
 !
-! Last Modified: Sunday, September 03, 2023 PM06:19:23
+! Last Modified: Tuesday, January 23, 2024 PM08:37:57
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -233,7 +233,7 @@ subroutine trstlp_sub(iact, nact, stage, A, b, delta, d, vmultc, z)
             & 'D is finite and ||D|| <= 2*DELTA at the beginning of stage 2', srname)
         call assert((nact >= 0 .and. nact <= min(mcon, n)), &
             & '0 <= NACT <= MIN(MCON, N) at the beginning of stage 2', srname)
-        call assert(all(vmultc(1:mcon - 1) >= 0), 'VMULTC >= 0 at the beginning of stage 2', srname)
+        call assert(RP == kind(0.0) .or. all(vmultc(1:mcon - 1) >= 0), 'VMULTC >= 0 at the beginning of stage 2', srname)
         ! N.B.: Stage 1 defines only VMULTC(1:M); VMULTC(M+1) is undefined!
     end if
 end if
@@ -301,7 +301,7 @@ subroutine trstlp_sub(iact, nact, stage, A, b, delta, d, vmultc, z)
 maxiter = int(min(10**min(4, range(0_IK)), 100 * int(max(m, n))), IK)
 do iter = 1, maxiter
     if (DEBUGGING) then
-        call assert(all(vmultc >= 0), 'VMULTC >= 0', srname)
+        call assert(RP == kind(0.0) .or. all(vmultc >= 0), 'VMULTC >= 0', srname)
     end if
     if (stage == 1) then
         optnew = cviol
@@ -548,13 +548,13 @@ subroutine trstlp_sub(iact, nact, stage, A, b, delta, d, vmultc, z)
     ! Update D, VMULTC and CVIOL.
     dold = d
     d = (ONE - frac) * d + frac * dnew
-    ! Exit in case of Inf/NaN in D.
-    if (.not. is_finite(sum(abs(d)))) then
+    vmultc = max(ZERO, (ONE - frac) * vmultc + frac * vmultd)
+    ! Exit in case of Inf/NaN in D or VMULTC.
+    if (.not. (is_finite(sum(abs(d))) .and. is_finite(sum(abs(vmultc))))) then
         d = dold  ! Should we restore also IACT, NACT, VMULTC, and Z?
         exit
     end if
 
-    vmultc = max(ZERO, (ONE - frac) * vmultc + frac * vmultd)
     if (stage == 1) then
         !cviol = (ONE - frac) * cvold + frac * cviol  ! Powell's version
         ! In theory, CVIOL = MAXVAL([MATPROD(D, A) - B, ZERO]), yet the CVIOL updated as above
@@ -577,7 +577,7 @@ subroutine trstlp_sub(iact, nact, stage, A, b, delta, d, vmultc, z)
 if (DEBUGGING) then
     call assert(size(iact) == mcon, 'SIZE(IACT) == MCON', srname)
     call assert(size(vmultc) == mcon, 'SIZE(VMULTC) == MCON', srname)
-    call assert(all(vmultc >= 0), 'VMULTC >= 0', srname)
+    call assert(RP == kind(0.0) .or. all(vmultc >= 0), 'VMULTC >= 0', srname)
     call assert(size(d) == n, 'SIZE(D) == N', srname)
     call assert(all(is_finite(d)), 'D is finite', srname)
     call assert(norm(d) <= TWO * delta, '||D|| <= 2*DELTA', srname)