Author: bugman Date: Sun Jul 12 23:20:05 2009 New Revision: 9189 URL: http://svn.gna.org/viewcvs/relax?rev=9189&view=rev Log: Merged revisions 9070-9188 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r9081 | bugman | 2009-06-18 15:01:00 +0200 (Thu, 18 Jun 2009) | 3 lines Added numpy int and float data types to the list of tested user function args. ........ Modified: branches/frame_order/ (props changed) branches/frame_order/test_suite/unit_tests/_prompt/data_types.py Propchange: branches/frame_order/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Sun Jul 12 23:20:05 2009 @@ -1,1 +1,1 @@ -/1.3:1-9069 +/1.3:1-9188 Modified: branches/frame_order/test_suite/unit_tests/_prompt/data_types.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order/test_suite/unit_tests/_prompt/data_types.py?rev=9189&r1=9188&r2=9189&view=diff ============================================================================== --- branches/frame_order/test_suite/unit_tests/_prompt/data_types.py (original) +++ branches/frame_order/test_suite/unit_tests/_prompt/data_types.py Sun Jul 12 23:20:05 2009 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2007 Edward d'Auvergne # +# Copyright (C) 2007-2009 Edward d'Auvergne # # # # This file is part of the program relax. # # # @@ -21,6 +21,7 @@ ############################################################################### # Python module imports. +from numpy import int8, int16, int32, int64, float32, float64, float128, zeros from os import tmpfile @@ -69,6 +70,12 @@ DATA_TYPES.append(['int', 10]) DATA_TYPES.append(['int', -10]) +# Numpy ints. +DATA_TYPES.append(['int', zeros(2, int8)[0]]) +DATA_TYPES.append(['int', zeros(2, int16)[0]]) +DATA_TYPES.append(['int', zeros(2, int32)[0]]) +DATA_TYPES.append(['int', zeros(2, int64)[0]]) + # File descriptor. DATA_TYPES.append(['file', tmpfile()]) @@ -76,6 +83,11 @@ DATA_TYPES.append(['float', 0.0]) DATA_TYPES.append(['float', 1e-7]) DATA_TYPES.append(['float', 1000000.0]) + +# Numpy floats. +DATA_TYPES.append(['float', zeros(2, float32)[0]]) +DATA_TYPES.append(['float', zeros(2, float64)[0]]) +DATA_TYPES.append(['float', zeros(2, float128)[0]]) # Functions. DATA_TYPES.append(['function', dummy_fn]) @@ -87,9 +99,11 @@ # List of integers. DATA_TYPES.append(['int list', [-1, 0, 1]]) +DATA_TYPES.append(['int list', [zeros(2, int32)[0]]]) # List of floats. DATA_TYPES.append(['float list', [-1., 0., 1.]]) +DATA_TYPES.append(['float list', [zeros(2, float64)[0]]]) # List of numbers. DATA_TYPES.append(['number list', [-1., 0, 1.]])