r26695 - /branches/frame_order_cleanup/test_suite/system_tests/frame_order.py -- November 21, 2014 - 18:09

Author: bugman
Date: Fri Nov 21 18:09:17 2014
New Revision: 26695

URL: http://svn.gna.org/viewcvs/relax?rev=26695&view=rev
Log:
Fixes for the checks in the Frame_order.test_pdb_model_* system tests.

Atomic positions are now checked with self.assertAlmostEqual() to 3 places, 
and the residue and atom
names and numbers are checked with self.assertEqual().


Modified:
    branches/frame_order_cleanup/test_suite/system_tests/frame_order.py

Modified: branches/frame_order_cleanup/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/frame_order.py?rev=26695&r1=26694&r2=26695&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/frame_order.py 
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/frame_order.py Fri 
Nov 21 18:09:17 2014
@@ -1734,10 +1734,10 @@
 
                 # Checks.
                 print("Checking residue %s %s, atom %s %s, at position %s." 
% (data[i][index][0], data[i][index][1], data[i][index][2], 
data[i][index][3], data[i][index][4]))
-                self.assertAlmostEqual(data[i][index][0], res_num, 3)
-                self.assertAlmostEqual(data[i][index][1], res_name, 3)
-                self.assertAlmostEqual(data[i][index][2], atom_num, 3)
-                self.assertAlmostEqual(data[i][index][3], atom_name, 3)
+                self.assertEqual(data[i][index][0], res_num)
+                self.assertEqual(data[i][index][1], res_name)
+                self.assertEqual(data[i][index][2], atom_num)
+                self.assertEqual(data[i][index][3], atom_name)
                 self.assertAlmostEqual(data[i][index][4][0], pos[0][0], 3)
                 self.assertAlmostEqual(data[i][index][4][1], pos[0][1], 3)
                 self.assertAlmostEqual(data[i][index][4][2], pos[0][2], 3)
@@ -1828,9 +1828,9 @@
                 self.assertEqual(data[i][index][1], res_name)
                 self.assertEqual(data[i][index][2], atom_num)
                 self.assertEqual(data[i][index][3], atom_name)
-                self.assertEqual(data[i][index][4][0], pos[0][0])
-                self.assertEqual(data[i][index][4][1], pos[0][1])
-                self.assertEqual(data[i][index][4][2], pos[0][2])
+                self.assertAlmostEqual(data[i][index][4][0], pos[0][0], 3)
+                self.assertAlmostEqual(data[i][index][4][1], pos[0][1], 3)
+                self.assertAlmostEqual(data[i][index][4][2], pos[0][2], 3)
 
                 # Increment the index.
                 index += 1
@@ -2049,10 +2049,10 @@
 
             # Checks (to the 3 places accuracy of a PDB file).
             print("Checking residue %s %s, atom %s %s, at position %s." % 
(data[index][0], data[index][1], data[index][2], data[index][3], 
data[index][4]))
-            self.assertAlmostEqual(data[index][0], res_num, 3)
-            self.assertAlmostEqual(data[index][1], res_name, 3)
-            self.assertAlmostEqual(data[index][2], atom_num, 3)
-            self.assertAlmostEqual(data[index][3], atom_name, 3)
+            self.assertEqual(data[index][0], res_num)
+            self.assertEqual(data[index][1], res_name)
+            self.assertEqual(data[index][2], atom_num)
+            self.assertEqual(data[index][3], atom_name)
             self.assertAlmostEqual(data[index][4][0], pos[0][0], 3)
             self.assertAlmostEqual(data[index][4][1], pos[0][1], 3)
             self.assertAlmostEqual(data[index][4][2], pos[0][2], 3)
@@ -2135,9 +2135,9 @@
             self.assertEqual(data[index][1], res_name)
             self.assertEqual(data[index][2], atom_num)
             self.assertEqual(data[index][3], atom_name)
-            self.assertEqual(data[index][4][0], pos[0][0])
-            self.assertEqual(data[index][4][1], pos[0][1])
-            self.assertEqual(data[index][4][2], pos[0][2])
+            self.assertAlmostEqual(data[index][4][0], pos[0][0], 3)
+            self.assertAlmostEqual(data[index][4][1], pos[0][1], 3)
+            self.assertAlmostEqual(data[index][4][2], pos[0][2], 3)
 
             # Increment the index.
             index += 1