r25886 - in /branches/frame_order_cleanup: specific_analyses/frame_order/optimisation.py test_suite/system_tests/frame_order.py -- September 17, 2014 - 17:11

Author: bugman
Date: Wed Sep 17 17:11:55 2014
New Revision: 25886

URL: http://svn.gna.org/viewcvs/relax?rev=25886&view=rev
Log:
Renamed the cdp.used_sobol_points variable to sobol_points_used.

This is created by the count_sobol_points() frame order function.  The name 
change is to match the
sobol_max_points and sobol_oversample variable names.

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

Modified: 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py?rev=25886&r1=25885&r2=25886&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
(original)
+++ 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
Wed Sep 17 17:11:55 2014
@@ -161,7 +161,7 @@
             break
 
     # Store the count.
-    cdp.used_sobol_points = count
+    cdp.sobol_points_used = count
 
     # Printout.
     format = "    %-30s %20s\n"

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=25886&r1=25885&r2=25886&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 Wed 
Sep 17 17:11:55 2014
@@ -956,7 +956,7 @@
         self.interpreter.frame_order.sobol_setup(20)
 
         # Check the count.
-        self.assertEqual(cdp.used_sobol_points, 20)
+        self.assertEqual(cdp.sobol_points_used, 20)
 
 
     def test_count_sobol_points2(self):
@@ -973,7 +973,7 @@
         self.interpreter.frame_order.count_sobol_points()
 
         # Check the count.
-        self.assertEqual(cdp.used_sobol_points, 20)
+        self.assertEqual(cdp.sobol_points_used, 20)
 
 
     def test_count_sobol_points_free_rotor(self):
@@ -993,7 +993,7 @@
         self.interpreter.frame_order.count_sobol_points()
 
         # Check the count.
-        self.assertEqual(cdp.used_sobol_points, 20)
+        self.assertEqual(cdp.sobol_points_used, 20)
 
 
     def test_count_sobol_points_iso_cone_free_rotor(self):
@@ -1013,7 +1013,7 @@
         self.interpreter.frame_order.count_sobol_points()
 
         # Check the count.
-        self.assertEqual(cdp.used_sobol_points, 20)
+        self.assertEqual(cdp.sobol_points_used, 20)
 
 
     def test_count_sobol_points_rigid(self):
@@ -1030,7 +1030,7 @@
         self.interpreter.frame_order.count_sobol_points()
 
         # Check the count.
-        self.assert_(not hasattr(cdp, 'used_sobol_points'))
+        self.assert_(not hasattr(cdp, 'sobol_points_used'))
 
 
     def test_count_sobol_points_rotor(self):
@@ -1050,7 +1050,7 @@
         self.interpreter.frame_order.count_sobol_points()
 
         # Check the count.
-        self.assertEqual(cdp.used_sobol_points, 20)
+        self.assertEqual(cdp.sobol_points_used, 20)
 
 
     def test_frame_order_pdb_model_failed_pivot(self):