Author: bugman
Date: Mon Jul 13 00:06:12 2009
New Revision: 9197
URL: http://svn.gna.org/viewcvs/relax?rev=9197&view=rev
Log:
Merged revisions 9189-9196 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r9194 | bugman | 2009-07-12 23:55:17 +0200 (Sun, 12 Jul 2009) | 3 lines
Commented out a data type temporarily until someone complains about int32
types.
........
r9195 | bugman | 2009-07-13 00:03:51 +0200 (Mon, 13 Jul 2009) | 5 lines
Created lists of number types (python and numpy).
These are in the prompt.num_types module and are now used by value.set()
for argument checking.
........
r9196 | bugman | 2009-07-13 00:05:31 +0200 (Mon, 13 Jul 2009) | 6 lines
Reverted r9194, the temporary commenting out of a data type.
The command used was:
svn merge -r9194:9193 .
........
Added:
branches/frame_order/prompt/num_types.py
- copied unchanged from r9196, 1.3/prompt/num_types.py
Modified:
branches/frame_order/ (props changed)
branches/frame_order/prompt/value.py
Propchange: branches/frame_order/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 13 00:06:12 2009
@@ -1,1 +1,1 @@
-/1.3:1-9188
+/1.3:1-9196
Modified: branches/frame_order/prompt/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order/prompt/value.py?rev=9197&r1=9196&r2=9197&view=diff
==============================================================================
--- branches/frame_order/prompt/value.py (original)
+++ branches/frame_order/prompt/value.py Mon Jul 13 00:06:12 2009
@@ -32,6 +32,7 @@
import help
from generic_fns import diffusion_tensor
from generic_fns import value
+from num_types import int_list, float_list
from relax_errors import RelaxError, RelaxFloatError, RelaxIntError,
RelaxListFloatStrError, RelaxListStrError, RelaxNoneFloatStrListError,
RelaxNoneIntError, RelaxNoneStrError, RelaxNoneStrListError, RelaxStrError
from specific_fns.model_free import Model_free
from specific_fns.jw_mapping import Jw_mapping
@@ -209,7 +210,7 @@
raise RelaxStrError, ('parameter', param)
# The scaling factor.
- if type(scaling) != float:
+ if type(scaling) not in float_list:
raise RelaxFloatError, ('scaling', scaling)
# The file name.
@@ -217,19 +218,19 @@
raise RelaxStrError, ('file', file)
# The number column.
- if type(num_col) != int:
+ if type(num_col) not in int_list:
raise RelaxIntError, ('residue number column', num_col)
# The name column.
- if name_col != None and type(name_col) != int:
+ if name_col != None and type(name_col) not in int_list:
raise RelaxNoneIntError, ('residue name column', name_col)
# The data column.
- if type(data_col) != int:
+ if type(data_col) not in int_list:
raise RelaxIntError, ('data column', data_col)
# The error column.
- if error_col != None and type(error_col) != int:
+ if error_col != None and type(error_col) not in int_list:
raise RelaxNoneIntError, ('error column', error_col)
# Column separator.
@@ -368,7 +369,7 @@
print text
# The value.
- if val != None and type(val) != float and type(val) != int and
type(val) != str and type(val) != list:
+ if val != None and type(val) not in float_list and type(val) not in
int_list and type(val) != str and type(val) != list:
raise RelaxNoneFloatStrListError, ('value', val)
if type(val) == list:
# Empty list.
@@ -377,7 +378,8 @@
# Check for values.
for i in xrange(len(val)):
- if type(val[i]) != float and type(val[i]) != int:
+ if type(val[i]) not in float_list and type(val[i]) not in
int_list:
+ print type(val[i])
raise RelaxListFloatStrError, ('value', val)
# The parameter.
r9197 - in /branches/frame_order: ./ prompt/num_types.py prompt/value.py