Author: bugman Date: Fri Oct 27 10:33:54 2006 New Revision: 2674 URL: http://svn.gna.org/viewcvs/relax?rev=2674&view=rev Log: Improvements to optimisation tests of the test suite. These improvements include all of the suggestions by Chris MacRaild at https://mail.gna.org/public/relax-devel/2006-10/msg00141.html (Message-id: <1161860754.3525.27.camel@mrspell>). The exact changes are detailed in the follow up post located at https://mail.gna.org/public/relax-devel/2006-10/msg00145.html (Message-id: <7f080ed10610260854p3d7d0a45w32c731345ed244d3@xxxxxxxxxxxxxx>). Modified: 1.2/test_suite/model_free.py Modified: 1.2/test_suite/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.2/test_suite/model_free.py?rev=2674&r1=2673&r2=2674&view=diff ============================================================================== --- 1.2/test_suite/model_free.py (original) +++ 1.2/test_suite/model_free.py Fri Oct 27 10:33:54 2006 @@ -380,7 +380,7 @@ success = 1 if not self.test_values(val1=0.970, val2=data.s2, error=error, name='S2 value'): success = 0 - if not self.test_values(val1=2048 * 1e-12, val2=data.te, error=error, name='te value', scale = 1e12): + if not self.test_values(val1=2048 * 1e-12, val2=data.te, error=error, name='te value (ns)', scale=1e9): success = 0 if not self.test_values(val1=0.149 / (2.0 * pi * data.frq[0])**2, val2=data.rex, error=error, name='Rex value', scale=(2.0 * pi * data.frq[0])**2): success = 0 @@ -441,7 +441,7 @@ success = 1 if not self.test_values(val1=0.970, val2=data.s2, error=error, name='S2 value'): success = 0 - if not self.test_values(val1=2048 * 1e-12, val2=data.te, error=error, name='te value', scale = 1e12): + if not self.test_values(val1=2048 * 1e-12, val2=data.te, error=error, name='te value (ns)', scale=1e9): success = 0 if not self.test_values(val1=0.149 / (2.0 * pi * data.frq[0])**2, val2=data.rex, error=error, name='Rex value', scale=(2.0 * pi * data.frq[0])**2): success = 0 @@ -502,7 +502,7 @@ success = 1 if not self.test_values(val1=0.9097900390625, val2=data.s2, error=error, name='S2 value'): success = 0 - if not self.test_values(val1=2.5000000000000001e-11, val2=data.te, error=error, name='te value', scale = 1e12): + if not self.test_values(val1=2.5000000000000001e-11, val2=data.te, error=error, name='te value (ns)', scale=1e9): success = 0 if not self.test_values(val1=1.24017333984375 / (2.0 * pi * data.frq[0])**2, val2=data.rex, error=error, name='Rex value', scale=(2.0 * pi * data.frq[0])**2): success = 0 @@ -563,7 +563,7 @@ success = 1 if not self.test_values(val1=1.0, val2=data.s2, error=error, name='S2 value'): success = 0 - if not self.test_values(val1=0.0, val2=data.te, error=error, name='te value', scale = 1e12): + if not self.test_values(val1=0.0, val2=data.te, error=error, name='te value (ns)', scale=1e9): success = 0 if not self.test_values(val1=0.0, val2=data.rex, error=error, name='Rex value'): success = 0 @@ -625,7 +625,7 @@ success = 1 if not self.test_values(val1=0.970, val2=data.s2, error=error, name='S2 value'): success = 0 - if not self.test_values(val1=2048 * 1e-12, val2=data.te, error=error, name='te value', scale = 1e12): + if not self.test_values(val1=2048 * 1e-12, val2=data.te, error=error, name='te value (ns)', scale=1e9): success = 0 if not self.test_values(val1=0.149 / (2.0 * pi * data.frq[0])**2, val2=data.rex, error=error, name='Rex value', scale=(2.0 * pi * data.frq[0])**2): success = 0 @@ -633,7 +633,7 @@ success = 0 if not self.test_values(val1=18, val2=data.iter, name='iteration count', max=1): success = 0 - if not self.test_values(val1=55, val2=data.f_count, name='function count', max=1): + if not self.test_values(val1=96, val2=data.f_count, name='function count', max=1): success = 0 if not self.test_values(val1=23, val2=data.g_count, name='gradient count', max=1): success = 0 @@ -687,7 +687,7 @@ success = 1 if not self.test_values(val1=0.970, val2=data.s2, error=error, name='S2 value'): success = 0 - if not self.test_values(val1=2048 * 1e-12, val2=data.te, error=error, name='te value', scale = 1e12): + if not self.test_values(val1=2048 * 1e-12, val2=data.te, error=error, name='te value (ns)', scale=1e9): success = 0 if not self.test_values(val1=0.149 / (2.0 * pi * data.frq[0])**2, val2=data.rex, error=error, name='Rex value', scale=(2.0 * pi * data.frq[0])**2): success = 0 @@ -748,7 +748,7 @@ success = 1 if not self.test_values(val1=0.91579220834688024, val2=data.s2, error=error, name='S2 value'): success = 0 - if not self.test_values(val1=3.056865872253173e-13, val2=data.te, error=error, name='te value', scale = 1e12): + if not self.test_values(val1=3.056865872253173e-13, val2=data.te, error=error, name='te value (ns)', scale=1e9): success = 0 if not self.test_values(val1=0.34008409798366124 / (2.0 * pi * data.frq[0])**2, val2=data.rex, error=error, name='Rex value', scale=(2.0 * pi * data.frq[0])**2): success = 0 @@ -809,7 +809,7 @@ success = 1 if not self.test_values(val1=0.91619994957822126, val2=data.s2, error=error, name='S2 value'): success = 0 - if not self.test_values(val1=1.2319687570987945e-13, val2=data.te, error=error, name='te value', scale = 1e12): + if not self.test_values(val1=1.2319687570987945e-13, val2=data.te, error=error, name='te value (ns)', scale=1e9): success = 0 if not self.test_values(val1=0.16249110942961512 / (2.0 * pi * data.frq[0])**2, val2=data.rex, error=error, name='Rex value', scale=(2.0 * pi * data.frq[0])**2): success = 0 @@ -864,11 +864,11 @@ success = 1 if not self.test_values(val1=1.0, val2=data.s2, error=error, name='S2 value'): success = 0 - if not self.test_values(val1=0.0, val2=data.te, error=error, name='te value', scale = 1e12): + if not self.test_values(val1=0.0, val2=data.te, error=error, name='te value (ns)', scale=1e9): success = 0 if not self.test_values(val1=0.0, val2=data.rex, error=error, name='Rex value'): success = 0 - if not self.test_values(val1=3.9844117908982288, val2=data.chi2, error=1e-20, name='chi-squared value'): + if not self.test_values(val1=3.9844117908982288, val2=data.chi2, error=error, name='chi-squared value'): success = 0 if not self.test_values(val1=1331, val2=data.iter, name='iteration count', max=1): success = 0 @@ -1261,19 +1261,19 @@ # Failure (with an error tolerance). if error: if val2*scale < val1*scale - error or val2*scale > val1*scale + error: - print "The " + name + " of '" + `val2*scale` + "' should be within +/- " + `error` + " of " + `val1*scale` + "." + print "The " + name + " of " + `val2*scale` + " should be within +/- " + `error` + " of " + `val1*scale` + "." return # Failure (val2 is greater than val1). elif max: if val2 > val1: - print "The " + name + " of '" + `val2*scale` + "' should be greater than " + `val1*scale` + "." + print "The " + name + " of " + `val2*scale` + " should be less than " + `val1*scale` + "." return # Failure (with no error tolerance). else: if val2 != val1: - print "The " + name + " of '" + `val2*scale` + "' should be " + `val1*scale` + "." + print "The " + name + " of " + `val2*scale` + " should be " + `val1*scale` + "." return # Success.