r22300 - in /branches/double_rotor: ./ test_suite/system_tests/relax_disp.py -- February 25, 2014 - 09:28

Author: bugman
Date: Tue Feb 25 09:28:32 2014
New Revision: 22300

URL: http://svn.gna.org/viewcvs/relax?rev=22300&view=rev
Log:
Merged revisions 22299 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r22299 | bugman | 2014-02-25 09:25:39 +0100 (Tue, 25 Feb 2014) | 7 lines
  
  Fix for bug #21695 (https://gna.org/bugs/?21695).
  
  This is the failure of the relaxation dispersion system tests on a 64-bit 
MS Windows system due to
  lower precision of the platform.  Two of the errors have already been found 
on a 64-bit Windows
  Vista virtual machine and fixed.  The last test should now also pass.
........

Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/test_suite/system_tests/relax_disp.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 25 09:28:32 2014
@@ -1,1 +1,1 @@
-/trunk:1-22297
+/trunk:1-22299

Modified: branches/double_rotor/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/relax_disp.py?rev=22300&r1=22299&r2=22300&view=diff
==============================================================================
--- branches/double_rotor/test_suite/system_tests/relax_disp.py (original)
+++ branches/double_rotor/test_suite/system_tests/relax_disp.py Tue Feb 25 
09:28:32 2014
@@ -1787,12 +1787,12 @@
         print("%-20s %20.15g\n" % ("chi2", spin.chi2))
 
         # Checks for residue :9.
-        self.assertAlmostEqual(spin.r2[r20_key1], 8.334232330326190, 4)
-        self.assertAlmostEqual(spin.r2[r20_key2], 8.756773997879968, 4)
-        self.assertAlmostEqual(spin.r2[r20_key3], 10.219320492033058, 4)
-        self.assertAlmostEqual(spin.pA, 0.950310172115387, 4)
-        self.assertAlmostEqual(spin.dw, 4.356737157889636, 4)
-        self.assertAlmostEqual(spin.kex/1000, 433.176323890829849/1000, 4)
+        self.assertAlmostEqual(spin.r2[r20_key1], 8.334232330326190, 2)
+        self.assertAlmostEqual(spin.r2[r20_key2], 8.756773997879968, 2)
+        self.assertAlmostEqual(spin.r2[r20_key3], 10.219320492033058, 1)
+        self.assertAlmostEqual(spin.pA, 0.950310172115387, 3)
+        self.assertAlmostEqual(spin.dw, 4.356737157889636, 3)
+        self.assertAlmostEqual(spin.kex/1000, 433.176323890829849/1000, 3)
         self.assertAlmostEqual(spin.chi2, 17.37460582872912, 1)