r4418 - /1.3/test_suite/unit_tests/_prompt/test_minimisation.py -- January 07, 2008 - 13:51

Author: bugman
Date: Mon Jan  7 13:40:55 2008
New Revision: 4418

URL: http://svn.gna.org/viewcvs/relax?rev=4418&view=rev
Log:
Bug fix for the lower and upper args to the grid_search() user function.


Modified:
    1.3/test_suite/unit_tests/_prompt/test_minimisation.py

Modified: 1.3/test_suite/unit_tests/_prompt/test_minimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_minimisation.py?rev=4418&r1=4417&r2=4418&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_prompt/test_minimisation.py (original)
+++ 1.3/test_suite/unit_tests/_prompt/test_minimisation.py Mon Jan  7 
13:40:55 2008
@@ -63,8 +63,13 @@
             if data[0] == 'None':
                 continue
 
-            # Catch the non-number list arguments.
-            if type(data[1]) == list and (data[0] != 'int list' or data[0] 
!= 'float list' or data[0] != 'number list'):
+            # Catch the list arguments.
+            if type(data[1]) == list:
+                # Catch the int, float, and number list arguments, and skip 
them.
+                if data[0] == 'int list' or data[0] == 'float list' or 
data[0] == 'number list':
+                    continue
+
+                # The argument test.
                 self.assertRaises(RelaxListNumError, 
self.minimisation_fns.grid_search, lower=data[1])
 
             # All other arguments.
@@ -81,8 +86,13 @@
             if data[0] == 'None':
                 continue
 
-            # Catch the non-number list arguments.
-            if type(data[1]) == list and (data[0] != 'int list' or data[0] 
!= 'float list' or data[0] != 'number list'):
+            # Catch the list arguments.
+            if type(data[1]) == list:
+                # Catch the int, float, and number list arguments, and skip 
them.
+                if data[0] == 'int list' or data[0] == 'float list' or 
data[0] == 'number list':
+                    continue
+
+                # The argument test.
                 self.assertRaises(RelaxListNumError, 
self.minimisation_fns.grid_search, upper=data[1])
 
             # All other arguments.