r2672 - /1.2/test_suite/model_free.py -- October 26, 2006 - 11:12

Author: bugman
Date: Thu Oct 26 11:11:36 2006
New Revision: 2672

URL: http://svn.gna.org/viewcvs/relax?rev=2672&view=rev
Log:
Fixed a bug in the test suite introduced by the previous revision.

The bug was that the optimisation warning flag for the steepest descent and 
coordinate descent
optimisation algorithms was set to 'Maximum number of iterations reached' as 
optimisation was
terminated early.  This is now caught.


Modified:
    1.2/test_suite/model_free.py

Modified: 1.2/test_suite/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/test_suite/model_free.py?rev=2672&r1=2671&r2=2672&view=diff
==============================================================================
--- 1.2/test_suite/model_free.py (original)
+++ 1.2/test_suite/model_free.py Thu Oct 26 11:11:36 2006
@@ -518,7 +518,7 @@
             success = 0
 
         # Warning.
-        if data.warning:
+        if data.warning and not data.warning == 'Maximum number of 
iterations reached':
             print data.warning
             success = 0
 
@@ -579,7 +579,7 @@
             success = 0
 
         # Warning.
-        if data.warning:
+        if data.warning and not data.warning == 'Maximum number of 
iterations reached':
             print data.warning
             success = 0
 
@@ -764,7 +764,7 @@
             success = 0
 
         # Warning.
-        if data.warning:
+        if data.warning and not data.warning == 'Maximum number of 
iterations reached':
             print data.warning
             success = 0
 
@@ -825,7 +825,7 @@
             success = 0
 
         # Warning.
-        if data.warning:
+        if data.warning and not data.warning == 'Maximum number of 
iterations reached':
             print data.warning
             success = 0