Author: bugman Date: Thu Sep 4 14:51:17 2014 New Revision: 25622 URL: http://svn.gna.org/viewcvs/relax?rev=25622&view=rev Log: The dispersion model super profiling script now handles the IT99 bug differently. Instead of printing out a comment within the table of results, the warnings from the profiling_it99.py script will be printed out when it occurs. Modified: trunk/test_suite/shared_data/dispersion/profiling/disp_profile_all.py Modified: trunk/test_suite/shared_data/dispersion/profiling/disp_profile_all.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/profiling/disp_profile_all.py?rev=25622&r1=25621&r2=25622&view=diff ============================================================================== --- trunk/test_suite/shared_data/dispersion/profiling/disp_profile_all.py (original) +++ trunk/test_suite/shared_data/dispersion/profiling/disp_profile_all.py Thu Sep 4 14:51:17 2014 @@ -180,6 +180,10 @@ if hasattr(line, 'decode'): line = line.decode() + # Show all warnings for the record. + if search('WARNING', line): + print(line[:-1]) + # Find the profiling stats for the target function method. if not search('func_', line): continue @@ -287,8 +291,4 @@ for i in range(len(models)): # Alias. model, script, iter, scaling_factor = models[i] - if model == 'IT99': - comment = "IT99: Cluster of only 1 spin analysis, since v. 3.2.2 had a bug with clustering analysis.:" - else: - comment = "" - print("%-25s %7.3f+/-%.3f -> %7.3f+/-%.3f, %7.3fx faster. %s" % (model+':', ave_alt_cluster[model], sd_alt_cluster[model], ave_new_cluster[model], sd_new_cluster[model], speed_up_cluster[model], comment) ) + 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]) )