mailRe: r24306 - /branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by Edward d'Auvergne on June 25, 2014 - 09:21:
Hmmm, I hope that was not the reason why I created the
lib.linear_algebra.matrix_power.square_matrix_power() function :S  Ah,
no, I just looked at the code history.  This function is the mpower()
function from the 'fitting_main_kex.py' file attached to comment 3 of
task #7712 (https://gna.org/task/?7712#comment3,
https://gna.org/support/download.php?file_id=18263).  So this was just
copying code from the original sources for the numeric models in relax
(http://thread.gmane.org/gmane.science.nmr.relax.devel/4132/focus=4140).

Cheers,

Edward

On 25 June 2014 03:41,  <tlinnet@xxxxxxxxxxxxx> wrote:
Author: tlinnet
Date: Wed Jun 25 03:41:04 2014
New Revision: 24306

URL: http://svn.gna.org/viewcvs/relax?rev=24306&view=rev
Log:
Small fix for making sure that power is a integer in ns mmq 2site.

Following system tests was failing.
 - Relax_disp.test_korzhnev_2005_15n_dq_data
 - Relax_disp.test_korzhnev_2005_15n_sq_data
 - Relax_disp.test_korzhnev_2005_15n_zq_data
 - Relax_disp.test_korzhnev_2005_1h_sq_data
 - Relax_disp.test_korzhnev_2005_all_data
 - Relax_disp.test_korzhnev_2005_all_data_disp_speed_bug

They should already be integers, but is now solved.

Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.

Modified:
    branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py

Modified: branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py?rev=24306&r1=24305&r2=24306&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py     (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py     Wed Jun 25 
03:41:04 2014
@@ -223,7 +223,7 @@
                 # Loop over the time points, back calculating the R2eff 
values.
                 for i in range(num_points_i):
                     # Extract data from array.
-                    power_i = power[si, mi, oi, i]
+                    power_i = int(power[si, mi, oi, i])
                     M1_M2_i = M1_M2_mat[si, mi, oi, i]
                     M1_M2_star_i = M1_M2_star_mat[si, mi, oi, i]
                     M2_M1_i = M2_M1_mat[si, mi, oi, i]
@@ -371,7 +371,7 @@
                 # Loop over the time points, back calculating the R2eff 
values.
                 for i in range(num_points_i):
                     # Extract data from array.
-                    power_i = power[si, mi, oi, i]
+                    power_i = int(power[si, mi, oi, i])
                     evol_block_i = evol_block_mat[si, mi, oi, i]

                     # The full evolution.


_______________________________________________
relax (http://www.nmr-relax.com)

This is the relax-commits mailing list
relax-commits@xxxxxxx

To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits



Related Messages


Powered by MHonArc, Updated Fri Jun 27 18:20:17 2014