Author: bugman Date: Wed Jun 18 11:39:47 2014 New Revision: 24082 URL: http://svn.gna.org/viewcvs/relax?rev=24082&view=rev Log: Fixed the ordering of the relax versions in the dispersion super profiling script disp_profile_all.py. This has also been fixed in the disp_spin_speed branch to relax 3.2.2 comparison log. Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all_3.2.2.log Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py?rev=24082&r1=24081&r2=24082&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py (original) +++ branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py Wed Jun 18 11:39:47 2014 @@ -158,7 +158,7 @@ # Final printout. print("\n\nSingle spin analysis:") for model in models: - print("%-10s: %.3f+/-%.3f -> %.3f+/-%.3f, %.3fx faster." % (model, ave_new[model], sd_new[model], ave_alt[model], sd_alt[model], speed_up[model])) + print("%-10s: %.3f+/-%.3f -> %.3f+/-%.3f, %.3fx faster." % (model, ave_alt[model], sd_alt[model], ave_new[model], sd_new[model], speed_up[model])) print("\nCluster of 100 spins analysis:") for model in models: - print("%-10s: %.3f+/-%.3f -> %.3f+/-%.3f, %.3fx faster." % (model, ave_new_cluster[model], sd_new_cluster[model], ave_alt_cluster[model], sd_alt_cluster[model], speed_up_cluster[model])) + print("%-10s: %.3f+/-%.3f -> %.3f+/-%.3f, %.3fx faster." % (model, ave_alt_cluster[model], sd_alt_cluster[model], ave_new_cluster[model], sd_new_cluster[model], speed_up_cluster[model])) Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all_3.2.2.log URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all_3.2.2.log?rev=24082&r1=24081&r2=24082&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all_3.2.2.log (original) +++ branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all_3.2.2.log Wed Jun 18 11:39:47 2014 @@ -221,11 +221,11 @@ Single spin analysis: -CR72 : 0.174+/-0.004 -> 0.306+/-0.003, 1.751x faster. -TSMFK01 : 0.073+/-0.001 -> 0.164+/-0.013, 2.257x faster. -B14 : 0.380+/-0.005 -> 0.567+/-0.009, 1.492x faster. +CR72 : 0.306+/-0.003 -> 0.174+/-0.004, 1.751x faster. +TSMFK01 : 0.164+/-0.013 -> 0.073+/-0.001, 2.257x faster. +B14 : 0.567+/-0.009 -> 0.380+/-0.005, 1.492x faster. Cluster of 100 spins analysis: -CR72 : 1.117+/-0.021 -> 30.446+/-0.214, 27.262x faster. -TSMFK01 : 0.361+/-0.012 -> 15.940+/-0.222, 44.178x faster. -B14 : 5.002+/-0.031 -> 56.550+/-0.279, 11.305x faster. +CR72 : 30.446+/-0.214 -> 1.117+/-0.021, 27.262x faster. +TSMFK01 : 15.940+/-0.222 -> 0.361+/-0.012, 44.178x faster. +B14 : 56.550+/-0.279 -> 5.002+/-0.031, 11.305x faster.