Author: semor
Date: Wed Jan 9 16:37:37 2008
New Revision: 4558
URL: http://svn.gna.org/viewcvs/relax?rev=4558&view=rev
Log:
Merged revisions 4523-4527,4529-4547,4549-4551 via svnmerge from
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.3
........
r4523 | bugman | 2008-01-09 04:50:39 -0500 (Wed, 09 Jan 2008) | 5 lines
Renamed 'print_flag' to 'verbosity' in the calc(), grid_search(), and
minimise() user functions.
This arg is not really a flag, and it is the verbosity level, so this makes
more sense.
........
r4524 | bugman | 2008-01-09 04:53:06 -0500 (Wed, 09 Jan 2008) | 3 lines
Created a new error type for booleans - RelaxBoolError.
........
r4525 | bugman | 2008-01-09 04:57:51 -0500 (Wed, 09 Jan 2008) | 3 lines
Converted all the bin args (0/1) to bool args (True/False) in the
minimisation user functions.
........
r4526 | bugman | 2008-01-09 05:25:14 -0500 (Wed, 09 Jan 2008) | 3 lines
Changed all references to 'print_flag' to 'verbosity' in the user function
arg unit tests.
........
r4527 | bugman | 2008-01-09 05:26:16 -0500 (Wed, 09 Jan 2008) | 3 lines
Changed all the bin minimisation arg unit tests to tests for boolean args.
........
r4529 | bugman | 2008-01-09 05:37:04 -0500 (Wed, 09 Jan 2008) | 6 lines
Removal of all the old threading code!!!
This will all eventually be replaced by Gary Thompson's multi_processor
code, once it is ported to
the new relax design. This threading code was broken, buggy, and not fault
tolerant anyway.
........
r4530 | bugman | 2008-01-09 05:46:51 -0500 (Wed, 09 Jan 2008) | 6 lines
Updated the relax_io.extract_data() function.
The compression flag has been dropped as it is automatically determined and
updated the docstring to
epydoc format.
........
r4531 | bugman | 2008-01-09 05:48:33 -0500 (Wed, 09 Jan 2008) | 5 lines
Updated the relax_io.get_file_path() function.
The docstring has been updated to epydoc format.
........
r4532 | bugman | 2008-01-09 05:50:27 -0500 (Wed, 09 Jan 2008) | 3 lines
Added the return info to the relax_io.extract_data() function docstring.
........
r4533 | bugman | 2008-01-09 05:54:11 -0500 (Wed, 09 Jan 2008) | 6 lines
Updated the relax_io.log() function.
The compression flag has been dropped as it is automatically determined,
changed the 'print_flag'
arg to 'verbosity', and updated the docstring to epydoc format.
........
r4534 | bugman | 2008-01-09 05:56:14 -0500 (Wed, 09 Jan 2008) | 5 lines
Updated the relax_io.mkdir_nofail() function.
Changed the 'print_flag' arg to 'verbosity' and updated the docstring to
epydoc format.
........
r4535 | bugman | 2008-01-09 05:58:30 -0500 (Wed, 09 Jan 2008) | 5 lines
Updated the relax_io.open_read_file() function.
Changed the 'print_flag' arg to 'verbosity' and updated the docstring to
epydoc format.
........
r4536 | bugman | 2008-01-09 06:06:00 -0500 (Wed, 09 Jan 2008) | 5 lines
Spun out the compression determining code of open_read_file() into its own
function.
The new function is called determine_compression().
........
r4537 | bugman | 2008-01-09 06:06:46 -0500 (Wed, 09 Jan 2008) | 3 lines
Converted the devnull_import variable from a bin value to a boolean.
........
r4538 | bugman | 2008-01-09 06:26:39 -0500 (Wed, 09 Jan 2008) | 6 lines
Updated the relax_io.open_write_file() function.
The docstring has been updated for epydoc, the 'print_flag' arg changed to
'verbosity', and a
printed warning shifted to using a RelaxWarning.
........
r4539 | bugman | 2008-01-09 08:10:13 -0500 (Wed, 09 Jan 2008) | 3 lines
Updated the docstring of the relax_io.open_write_file() function for epydoc.
........
r4540 | bugman | 2008-01-09 08:12:14 -0500 (Wed, 09 Jan 2008) | 3 lines
Bug fix. The compress_type arg is no longer accepted.
........
r4541 | bugman | 2008-01-09 08:13:07 -0500 (Wed, 09 Jan 2008) | 3 lines
Bug fix. The compress_type arg is no longer accepted.
........
r4542 | bugman | 2008-01-09 08:16:22 -0500 (Wed, 09 Jan 2008) | 6 lines
Updated the generic_fns.state.load_state() function.
The compression flag has been dropped as it is automatically determined and
the docstring has been
converted to epydoc format.
........
r4543 | bugman | 2008-01-09 08:19:47 -0500 (Wed, 09 Jan 2008) | 5 lines
Updated the generic_fns.state.save_state() function.
The docstring has been converted to epydoc format and the 'force' arg
converted to a bool.
........
r4544 | bugman | 2008-01-09 08:24:45 -0500 (Wed, 09 Jan 2008) | 3 lines
Bug fix. The relax_io.determine_compression() function now returns the
full file path.
........
r4545 | bugman | 2008-01-09 08:28:24 -0500 (Wed, 09 Jan 2008) | 3 lines
Changed the 'force' arg of the state.save() user function too a boolean.
........
r4546 | bugman | 2008-01-09 08:29:21 -0500 (Wed, 09 Jan 2008) | 3 lines
Fixed a RelaxError import.
........
r4547 | bugman | 2008-01-09 08:30:40 -0500 (Wed, 09 Jan 2008) | 5 lines
Updated the force arg unit test of the state.save() user function.
The arg is now a boolean.
........
r4549 | bugman | 2008-01-09 08:38:00 -0500 (Wed, 09 Jan 2008) | 3 lines
Changed all instances of the 'print_flag' arg to 'verbosity' in the
generic_fns.minimise module.
........
r4550 | bugman | 2008-01-09 08:39:09 -0500 (Wed, 09 Jan 2008) | 3 lines
Removed some unused imports.
........
r4551 | bugman | 2008-01-09 08:41:03 -0500 (Wed, 09 Jan 2008) | 3 lines
Changed all the 'constraints' and 'scaling' args to be of bool type.
........
Removed:
branches/consistency_tests_1.3/processes.py
branches/consistency_tests_1.3/prompt/thread.py
branches/consistency_tests_1.3/thread_classes.py
Modified:
branches/consistency_tests_1.3/ (props changed)
branches/consistency_tests_1.3/generic_fns/minimise.py
branches/consistency_tests_1.3/generic_fns/state.py
branches/consistency_tests_1.3/prompt/__init__.py
branches/consistency_tests_1.3/prompt/interpreter.py
branches/consistency_tests_1.3/prompt/minimisation.py
branches/consistency_tests_1.3/prompt/state.py
branches/consistency_tests_1.3/relax
branches/consistency_tests_1.3/relax_errors.py
branches/consistency_tests_1.3/relax_io.py
branches/consistency_tests_1.3/test_suite/unit_tests/_prompt/test_minimisation.py
branches/consistency_tests_1.3/test_suite/unit_tests/_prompt/test_state.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/consistency_tests_1.3/generic_fns/minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/generic_fns/minimise.py?rev=4558&r1=4557&r2=4558&view=diff
Modified: branches/consistency_tests_1.3/generic_fns/state.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/generic_fns/state.py?rev=4558&r1=4557&r2=4558&view=diff
Removed: branches/consistency_tests_1.3/processes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/processes.py?rev=4557&view=auto
Modified: branches/consistency_tests_1.3/prompt/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/__init__.py?rev=4558&r1=4557&r2=4558&view=diff
Modified: branches/consistency_tests_1.3/prompt/interpreter.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/interpreter.py?rev=4558&r1=4557&r2=4558&view=diff
Modified: branches/consistency_tests_1.3/prompt/minimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/minimisation.py?rev=4558&r1=4557&r2=4558&view=diff
Modified: branches/consistency_tests_1.3/prompt/state.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/state.py?rev=4558&r1=4557&r2=4558&view=diff
Removed: branches/consistency_tests_1.3/prompt/thread.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/thread.py?rev=4557&view=auto
Modified: branches/consistency_tests_1.3/relax
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/relax?rev=4558&r1=4557&r2=4558&view=diff
Modified: branches/consistency_tests_1.3/relax_errors.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/relax_errors.py?rev=4558&r1=4557&r2=4558&view=diff
Modified: branches/consistency_tests_1.3/relax_io.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/relax_io.py?rev=4558&r1=4557&r2=4558&view=diff
Modified:
branches/consistency_tests_1.3/test_suite/unit_tests/_prompt/test_minimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/test_suite/unit_tests/_prompt/test_minimisation.py?rev=4558&r1=4557&r2=4558&view=diff
Modified:
branches/consistency_tests_1.3/test_suite/unit_tests/_prompt/test_state.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/test_suite/unit_tests/_prompt/test_state.py?rev=4558&r1=4557&r2=4558&view=diff
Removed: branches/consistency_tests_1.3/thread_classes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/thread_classes.py?rev=4557&view=auto
r4558 - in /branches/consistency_tests_1.3: ./ generic_fns/ prompt/ test_suite/unit_tests/_prompt/