Author: semor
Date: Thu Apr 3 19:36:07 2008
New Revision: 5273
URL: http://svn.gna.org/viewcvs/relax?rev=5273&view=rev
Log:
Merged revisions 5255,5258-5272 via svnmerge from
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.3
........
r5255 | bugman | 2008-04-03 04:31:42 -0400 (Thu, 03 Apr 2008) | 7 lines
Another fix for bug #11004 (https://gna.org/bugs/?11004).
This actually isn't a new bug as suggested in the emails (see the bug
report for links). It is the
same division by zero problem as was fixed in r5117 (1.3 line) and r5119
(1.2 line), just a few
lines down.
........
r5258 | semor | 2008-04-03 11:15:07 -0400 (Thu, 03 Apr 2008) | 3 lines
Removed the run argument as part of the moving to the new design.
........
r5259 | semor | 2008-04-03 11:18:46 -0400 (Thu, 03 Apr 2008) | 3 lines
More removal of the run argument as part of the moving to the new design.
........
r5260 | semor | 2008-04-03 11:21:17 -0400 (Thu, 03 Apr 2008) | 3 lines
More removal of the run argument as part of the moving to the new design.
........
r5261 | semor | 2008-04-03 11:25:11 -0400 (Thu, 03 Apr 2008) | 3 lines
More removal of the run argument as part of the moving to the new design.
........
r5262 | semor | 2008-04-03 11:26:29 -0400 (Thu, 03 Apr 2008) | 3 lines
More removal of the run argument as part of the moving to the new design.
........
r5263 | semor | 2008-04-03 11:32:39 -0400 (Thu, 03 Apr 2008) | 8 lines
Reverted revision 5262.
The command used was:
svn merge -r5262:5261 .
There is still a function called run() in prompt.interpreter which should
not be removed...
........
r5264 | semor | 2008-04-03 11:47:42 -0400 (Thu, 03 Apr 2008) | 3 lines
More removal of the run argument as part of the moving to the new design.
........
r5265 | semor | 2008-04-03 12:02:29 -0400 (Thu, 03 Apr 2008) | 3 lines
More removal of the run argument as part of the moving to the new design.
........
r5266 | semor | 2008-04-03 12:56:44 -0400 (Thu, 03 Apr 2008) | 7 lines
Fixed a few bugs introduced while modifying the code to the new design.
These bugs were noticed by Edward d'Auvergne in a post at:
https://mail.gna.org/public/relax-devel/2008-04/msg00011.html (Message-id:
<7f080ed10804030921h2703a004o65501fbd89cb08ed@xxxxxxxxxxxxxx>)
........
r5267 | semor | 2008-04-03 12:57:52 -0400 (Thu, 03 Apr 2008) | 3 lines
Added missing imports.
........
r5268 | semor | 2008-04-03 13:04:26 -0400 (Thu, 03 Apr 2008) | 7 lines
Changed "for i in xrange(len(cdp.res)):" to the spin_loop.
This was proposed by Edward d'Auvergne in a post at :
https://mail.gna.org/public/relax-devel/2008-04/msg00012.html (Message-id:
<7f080ed10804030926p4be2e72apa2ccef85a9062e57@xxxxxxxxxxxxxx>)
........
r5269 | semor | 2008-04-03 13:05:03 -0400 (Thu, 03 Apr 2008) | 3 lines
Added missing imports.
........
r5270 | semor | 2008-04-03 13:06:25 -0400 (Thu, 03 Apr 2008) | 3 lines
Updated the listing of the files in the prompt/ directory.
........
r5271 | semor | 2008-04-03 13:27:23 -0400 (Thu, 03 Apr 2008) | 3 lines
More removal of the run argument as part of the moving to the new design.
........
r5272 | semor | 2008-04-03 13:30:39 -0400 (Thu, 03 Apr 2008) | 3 lines
Corrected a typo.
........
Modified:
branches/consistency_tests_1.3/ (props changed)
branches/consistency_tests_1.3/generic_fns/grace.py
branches/consistency_tests_1.3/generic_fns/monte_carlo.py
branches/consistency_tests_1.3/prompt/__init__.py
branches/consistency_tests_1.3/prompt/angles.py
branches/consistency_tests_1.3/prompt/eliminate.py
branches/consistency_tests_1.3/prompt/fix.py
branches/consistency_tests_1.3/prompt/grace.py
branches/consistency_tests_1.3/prompt/molmol.py
branches/consistency_tests_1.3/prompt/monte_carlo.py
branches/consistency_tests_1.3/prompt/noe.py
branches/consistency_tests_1.3/specific_fns/jw_mapping.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/consistency_tests_1.3/generic_fns/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/generic_fns/grace.py?rev=5273&r1=5272&r2=5273&view=diff
Modified: branches/consistency_tests_1.3/generic_fns/monte_carlo.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/generic_fns/monte_carlo.py?rev=5273&r1=5272&r2=5273&view=diff
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=5273&r1=5272&r2=5273&view=diff
Modified: branches/consistency_tests_1.3/prompt/angles.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/angles.py?rev=5273&r1=5272&r2=5273&view=diff
Modified: branches/consistency_tests_1.3/prompt/eliminate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/eliminate.py?rev=5273&r1=5272&r2=5273&view=diff
Modified: branches/consistency_tests_1.3/prompt/fix.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/fix.py?rev=5273&r1=5272&r2=5273&view=diff
Modified: branches/consistency_tests_1.3/prompt/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/grace.py?rev=5273&r1=5272&r2=5273&view=diff
Modified: branches/consistency_tests_1.3/prompt/molmol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/molmol.py?rev=5273&r1=5272&r2=5273&view=diff
Modified: branches/consistency_tests_1.3/prompt/monte_carlo.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/monte_carlo.py?rev=5273&r1=5272&r2=5273&view=diff
Modified: branches/consistency_tests_1.3/prompt/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/noe.py?rev=5273&r1=5272&r2=5273&view=diff
Modified: branches/consistency_tests_1.3/specific_fns/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/specific_fns/jw_mapping.py?rev=5273&r1=5272&r2=5273&view=diff
r5273 - in /branches/consistency_tests_1.3: ./ generic_fns/ prompt/ specific_fns/