[Scipy-svn] r2111 - trunk/Lib/optimize/cobyla

scipy-svn at scipy.org scipy-svn at scipy.org
Mon Jul 17 20:25:50 EDT 2006


Author: oliphant
Date: 2006-07-17 19:25:47 -0500 (Mon, 17 Jul 2006)
New Revision: 2111

Modified:
   trunk/Lib/optimize/cobyla/trstlp.f
Log:
Change test to fix vmultd(k) to 0.0 when |vmultd(k)| < eps

Modified: trunk/Lib/optimize/cobyla/trstlp.f
===================================================================
--- trunk/Lib/optimize/cobyla/trstlp.f	2006-07-17 23:03:19 UTC (rev 2110)
+++ trunk/Lib/optimize/cobyla/trstlp.f	2006-07-18 00:25:47 UTC (rev 2111)
@@ -435,9 +435,9 @@
       ICON=0
 C     
       EPS = 2.2E-16
-C      EPS = 0.0D0
       DO 450 K=1,MCON
-      IF (VMULTD(K) .LT. -EPS) THEN
+      IF (VMULTD(K) .GT. -EPS .AND. VMULTD(K) .LT. EPS) VMULTD(K)=0.0D0
+      IF (VMULTD(K) .LT. 0.0D0) THEN
           TEMP=VMULTC(K)/(VMULTC(K)-VMULTD(K))
           IF (TEMP .LT. RATIO) THEN
               RATIO=TEMP




More information about the Scipy-svn mailing list