Author: bugman
Date: Thu May 29 13:59:18 2014
New Revision: 23594
URL: http://svn.gna.org/viewcvs/relax?rev=23594&view=rev
Log:
Merged revisions 23246-23250,23259,23268-23278,23295-23304 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/disp_speed
........
r23246 | tlinnet | 2014-05-20 01:47:30 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model: 'NS CPMG 2-site expanded'.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23247 | tlinnet | 2014-05-20 01:47:32 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model CR72.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
The skipping of test when num_points > 0, is a bad implementation.
If such a case should show, it is best to catch the wrong input for the
calculations. This is best done with a check before running the
calculations.
........
r23248 | tlinnet | 2014-05-20 01:47:34 +0200 (Tue, 20 May 2014) | 11 lines
Turned of processor.run_queue() when using calc().
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
A weird behaviour was found when running the test-suite.
Somehow, queued jobs from the last test suite was not flushed and done.
Running the test-suite gave errors on almost all tests.
Inspecting systemtest which only used calc() for the dispersion API, showed
that no jobs was queued
in the calculate() method, and the call to processor.run_queue(), was
turned off, solving the problem.
........
r23249 | tlinnet | 2014-05-20 01:47:37 +0200 (Tue, 20 May 2014) | 4 lines
An attempt to fix the pipe_control/minimisy.py minimise() call to
processor.run_queue().
It was thought that I was modifying the address of array class(back_calc).
But this does not seem to be the problem.
........
r23250 | tlinnet | 2014-05-20 02:02:19 +0200 (Tue, 20 May 2014) | 1 line
Fix for variable num_points not set.
........
r23259 | tlinnet | 2014-05-20 14:55:11 +0200 (Tue, 20 May 2014) | 34 lines
Reverted r23250-23248 as the correct fix was done in fixing bug 22055.
bug #22055 (https://gna.org/bugs/?22055) The processor.run_queue() does not
clean up in uni_processor - chain-reaction failures in the test suite.
The command used was:
svn merge -r23250:r23247 .
.....
r23250 | tlinnet | 2014-05-20 02:02:19 +0200 (Tue, 20 May 2014) | 1 line
Fix for variable num_points not set.
------------------------------------------------------------------------
r23249 | tlinnet | 2014-05-20 01:47:37 +0200 (Tue, 20 May 2014) | 4
lines
An attempt to fix the pipe_control/minimisy.py minimise() call to
processor.run_queue().
It was thought that I was modifying the address of array
class(back_calc).
But this does not seem to be the problem.
------------------------------------------------------------------------
r23248 | tlinnet | 2014-05-20 01:47:34 +0200 (Tue, 20 May 2014) | 11
lines
Turned of processor.run_queue() when using calc().
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
A weird behaviour was found when running the test-suite.
Somehow, queued jobs from the last test suite was not flushed and done.
Running the test-suite gave errors on almost all tests.
Inspecting systemtest which only used calc() for the dispersion API,
showed that no jobs was queued
in the calculate() method, and the call to processor.run_queue(), was
turned off, solving the problem.
.....
........
r23268 | tlinnet | 2014-05-20 22:29:35 +0200 (Tue, 20 May 2014) | 8 lines
Fix for commit 23246.
http://svn.gna.org/viewcvs/relax?view=revision&revision=23246
The testing taking a value to a power was performed wrong.
This made systemtest Relax_disp.test_hansen_cpmg_data_auto_analysis_numeric
not working.
........
r23269 | tlinnet | 2014-05-20 22:29:38 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model TSMFK01.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23270 | tlinnet | 2014-05-20 22:29:40 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model TP02.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23271 | tlinnet | 2014-05-20 22:29:41 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model TAP03.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23272 | tlinnet | 2014-05-20 22:29:43 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model DPL94.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23273 | tlinnet | 2014-05-20 22:29:45 +0200 (Tue, 20 May 2014) | 3 lines
Math-domain catching for model TAP03.
Another check for division with 0 inserted.
........
r23274 | tlinnet | 2014-05-20 22:29:47 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model MP05.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23275 | tlinnet | 2014-05-20 22:29:49 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model IT99.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23276 | tlinnet | 2014-05-20 22:29:50 +0200 (Tue, 20 May 2014) | 7 lines
Removed class object "back_calc" being updated per time point for model
LM63.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23277 | tlinnet | 2014-05-20 22:29:52 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model M61.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23278 | tlinnet | 2014-05-20 22:29:54 +0200 (Tue, 20 May 2014) | 10 lines
Math-domain catching for model MMQ CR72.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
These can be found via the --numpy-raise function to the systemtests.
To make the code look clean, the class object "back_calc" is no longer
being updated per time point, but is updated in the relax_disp target
function in
one go.
........
r23295 | tlinnet | 2014-05-21 13:02:55 +0200 (Wed, 21 May 2014) | 7 lines
Align math-domain catching for model CR72 with trunk implementation.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
The catching of errors have to be more careful.
........
r23296 | tlinnet | 2014-05-21 13:02:56 +0200 (Wed, 21 May 2014) | 7 lines
Align math-domain catching for model DPL94 with trunk implementation.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
The catching of errors have to be more careful.
........
r23297 | tlinnet | 2014-05-21 13:02:58 +0200 (Wed, 21 May 2014) | 7 lines
Align math-domain catching for model IT99 with trunk implementation.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
The catching of errors have to be more careful.
........
r23298 | tlinnet | 2014-05-21 13:02:59 +0200 (Wed, 21 May 2014) | 7 lines
Align math-domain catching for model LM63 with trunk implementation.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
The catching of errors have to be more careful.
........
r23299 | tlinnet | 2014-05-21 13:03:01 +0200 (Wed, 21 May 2014) | 7 lines
Align math-domain catching for model M61 with trunk implementation.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
The catching of errors have to be more careful.
........
r23300 | tlinnet | 2014-05-21 13:03:02 +0200 (Wed, 21 May 2014) | 7 lines
Align math-domain catching for model MP05 with trunk implementation.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
The catching of errors have to be more careful.
........
r23301 | tlinnet | 2014-05-21 13:03:04 +0200 (Wed, 21 May 2014) | 7 lines
Align math-domain catching for model TAP03 with trunk implementation.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
The catching of errors have to be more careful.
........
r23302 | tlinnet | 2014-05-21 13:03:06 +0200 (Wed, 21 May 2014) | 7 lines
Align math-domain catching for model TP02 with trunk implementation.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
The catching of errors have to be more careful.
........
r23303 | tlinnet | 2014-05-21 13:03:07 +0200 (Wed, 21 May 2014) | 7 lines
Align math-domain catching for model TSMFK01 with trunk implementation.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models.
This is to implement catching of math domain errors, before they occur.
The catching of errors have to be more careful.
........
r23304 | tlinnet | 2014-05-21 13:03:09 +0200 (Wed, 21 May 2014) | 5 lines
Removing unnecessary math-domain catching for model IT99.
task #7793: (https://gna.org/task/?7793) Speed-up of dispersion models..
The denominator is always positive.
........
Modified:
trunk/ (props changed)
trunk/lib/dispersion/cr72.py
trunk/lib/dispersion/dpl94.py
trunk/lib/dispersion/it99.py
trunk/lib/dispersion/lm63.py
trunk/lib/dispersion/m61.py
trunk/lib/dispersion/mmq_cr72.py
trunk/lib/dispersion/mp05.py
trunk/lib/dispersion/ns_cpmg_2site_expanded.py
trunk/lib/dispersion/tap03.py
trunk/lib/dispersion/tp02.py
trunk/lib/dispersion/tsmfk01.py
trunk/target_functions/relax_disp.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/lib/dispersion/cr72.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/cr72.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/dpl94.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/dpl94.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/it99.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/it99.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/lm63.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/lm63.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/m61.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/m61.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/mmq_cr72.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/mmq_cr72.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/mp05.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/mp05.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/ns_cpmg_2site_expanded.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/ns_cpmg_2site_expanded.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/tap03.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/tap03.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/tp02.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/tp02.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/lib/dispersion/tsmfk01.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/tsmfk01.py?rev=23594&r1=23593&r2=23594&view=diff
Modified: trunk/target_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/relax_disp.py?rev=23594&r1=23593&r2=23594&view=diff
r23594 - in /trunk: ./ lib/dispersion/ target_functions/