Author: bugman
Date: Wed Jun 18 18:22:56 2014
New Revision: 24117
URL: http://svn.gna.org/viewcvs/relax?rev=24117&view=rev
Log:
Alignment improvements for the final printout from the dispersion model super
profiling script.
The log file has been updated with what the new formatting will look like.
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=24117&r1=24116&r2=24117&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 18:22:56 2014
@@ -203,7 +203,7 @@
# Final printout.
print("\n\n100 single spins analysis:")
for model in models:
- print("%-25s %.3f+/-%.3f -> %.3f+/-%.3f, %.3fx faster." % (model+':',
ave_alt[model], sd_alt[model], ave_new[model], sd_new[model],
speed_up[model]))
+ print("%-25s %7.3f+/-%.3f -> %7.3f+/-%.3f, %7.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("%-25s %.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]))
+ print("%-25s %7.3f+/-%.3f -> %7.3f+/-%.3f, %7.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=24117&r1=24116&r2=24117&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 18:22:56 2014
@@ -465,19 +465,19 @@
100 single spins analysis:
-CR72: 3.063+/-0.039 -> 1.730+/-0.026, 1.770x faster.
-TSMFK01: 1.599+/-0.021 -> 0.711+/-0.006, 2.250x faster.
-B14: 5.698+/-0.044 -> 3.785+/-0.037, 1.505x faster.
-NS CPMG 2-site expanded: 8.002+/-0.100 -> 4.440+/-0.073, 1.802x faster.
+CR72: 3.063+/-0.039 -> 1.730+/-0.026, 1.770x faster.
+TSMFK01: 1.599+/-0.021 -> 0.711+/-0.006, 2.250x faster.
+B14: 5.698+/-0.044 -> 3.785+/-0.037, 1.505x faster.
+NS CPMG 2-site expanded: 8.002+/-0.100 -> 4.440+/-0.073, 1.802x faster.
NS CPMG 2-site 3D: 234.538+/-1.266 -> 125.493+/-0.943, 1.869x faster.
-DPL94: 22.707+/-0.233 -> 1.102+/-0.020, 20.607x faster.
+DPL94: 22.707+/-0.233 -> 1.102+/-0.020, 20.607x
faster.
NS R1rho 2-site: 242.971+/-3.178 -> 237.546+/-1.115, 1.023x faster.
Cluster of 100 spins analysis:
-CR72: 3.044+/-0.021 -> 0.111+/-0.001, 27.501x faster.
-TSMFK01: 1.594+/-0.019 -> 0.038+/-0.000, 41.611x faster.
-B14: 5.695+/-0.059 -> 0.502+/-0.005, 11.342x faster.
-NS CPMG 2-site expanded: 7.965+/-0.077 -> 0.672+/-0.007, 11.847x faster.
+CR72: 3.044+/-0.021 -> 0.111+/-0.001, 27.501x
faster.
+TSMFK01: 1.594+/-0.019 -> 0.038+/-0.000, 41.611x
faster.
+B14: 5.695+/-0.059 -> 0.502+/-0.005, 11.342x
faster.
+NS CPMG 2-site expanded: 7.965+/-0.077 -> 0.672+/-0.007, 11.847x
faster.
NS CPMG 2-site 3D: 236.166+/-2.211 -> 127.261+/-1.855, 1.856x faster.
-DPL94: 22.883+/-0.137 -> 0.143+/-0.003, 160.357x faster.
+DPL94: 22.883+/-0.137 -> 0.143+/-0.003, 160.357x
faster.
NS R1rho 2-site: 241.334+/-3.006 -> 235.866+/-1.808, 1.023x faster.
r24117 - /branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/