Author: bugman Date: Tue Jul 22 19:08:41 2014 New Revision: 24658 URL: http://svn.gna.org/viewcvs/relax?rev=24658&view=rev Log: Merged revisions 24018-24019,24022-24023,24026-24027,24032-24036 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/disp_spin_speed ........ r24018 | tlinnet | 2014-06-17 11:56:43 +0200 (Tue, 17 Jun 2014) | 5 lines Fix for systemtest: test_korzhnev_2005_all_data The masking for replacing values was wrong. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24019 | tlinnet | 2014-06-17 11:56:45 +0200 (Tue, 17 Jun 2014) | 3 lines Moved the cleaning of data points and replacing of values of out loop for model ns mmq 2site. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24022 | tlinnet | 2014-06-17 12:20:12 +0200 (Tue, 17 Jun 2014) | 6 lines Fix for structure cleaning and value replacing for model mmq CR72. System test: test_korzhnev_2005_all_data revealed how this should be done properly. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24023 | tlinnet | 2014-06-17 12:20:15 +0200 (Tue, 17 Jun 2014) | 5 lines Fix for systemtest test_korzhnev_2005_all_data_disp_speed_bug. The precision is lowered, and now matches the original systemtest. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24026 | tlinnet | 2014-06-17 13:07:40 +0200 (Tue, 17 Jun 2014) | 3 lines Replaced index to numpy array from example [0][si][mi][oi] to [0, si, mi, oi]. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24027 | tlinnet | 2014-06-17 13:07:42 +0200 (Tue, 17 Jun 2014) | 3 lines More replacing of numpy index. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24032 | tlinnet | 2014-06-17 14:53:47 +0200 (Tue, 17 Jun 2014) | 3 lines Documentation fix, where a double bracket "[[" has been copied into all lib functions. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24033 | tlinnet | 2014-06-17 14:53:49 +0200 (Tue, 17 Jun 2014) | 3 lines More fixes for numpy index in lib functions. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24034 | tlinnet | 2014-06-17 14:53:50 +0200 (Tue, 17 Jun 2014) | 3 lines Restructured target function for ns mmq 3site to the new API structure of higher dimensional data. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24035 | tlinnet | 2014-06-17 14:53:52 +0200 (Tue, 17 Jun 2014) | 3 lines Reorded the lib function for ns mmq 3site to use higher dimensional data. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ r24036 | tlinnet | 2014-06-17 14:53:54 +0200 (Tue, 17 Jun 2014) | 3 lines Documentation fix for which dimensionality number of points have. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ........ Modified: trunk/ (props changed) trunk/lib/dispersion/b14.py 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/m61b.py trunk/lib/dispersion/mmq_cr72.py trunk/lib/dispersion/mp05.py trunk/lib/dispersion/ns_cpmg_2site_3d.py trunk/lib/dispersion/ns_cpmg_2site_expanded.py trunk/lib/dispersion/ns_cpmg_2site_star.py trunk/lib/dispersion/ns_mmq_2site.py trunk/lib/dispersion/ns_mmq_3site.py trunk/lib/dispersion/tap03.py trunk/lib/dispersion/tp02.py trunk/lib/dispersion/tsmfk01.py trunk/target_functions/relax_disp.py trunk/test_suite/system_tests/relax_disp.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/lib/dispersion/b14.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/b14.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/cr72.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/cr72.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/dpl94.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/dpl94.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/it99.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/it99.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/lm63.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/lm63.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/m61.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/m61.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/m61b.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/m61b.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/mmq_cr72.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/mmq_cr72.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/mp05.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/mp05.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/ns_cpmg_2site_3d.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/ns_cpmg_2site_3d.py?rev=24658&r1=24657&r2=24658&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=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/ns_cpmg_2site_star.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/ns_cpmg_2site_star.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/ns_mmq_2site.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/ns_mmq_2site.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/ns_mmq_3site.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/ns_mmq_3site.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/tap03.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/tap03.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/tp02.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/tp02.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/lib/dispersion/tsmfk01.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/tsmfk01.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/target_functions/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/target_functions/relax_disp.py?rev=24658&r1=24657&r2=24658&view=diff Modified: trunk/test_suite/system_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=24658&r1=24657&r2=24658&view=diff