r26029 - in /branches/frame_order_cleanup: auto_analyses/ test_suite/system_tests/scripts/frame_order/cam/ -- September 25, 2014 - 10:30

Author: bugman
Date: Thu Sep 25 10:30:28 2014
New Revision: 26029

URL: http://svn.gna.org/viewcvs/relax?rev=26029&view=rev
Log:
Turned off the final state saving in the Frame_order.test_auto_analysis 
system test.

This almost halves the time required for the test.  A private class variable 
_final_state has been
added to the auto_analyses.frame_order.Frame_order_analysis class which when 
False will cause the
state saving step to be skipped.


Modified:
    branches/frame_order_cleanup/auto_analyses/frame_order.py
    
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py

Modified: branches/frame_order_cleanup/auto_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/frame_order.py?rev=26029&r1=26028&r2=26029&view=diff
==============================================================================
--- branches/frame_order_cleanup/auto_analyses/frame_order.py   (original)
+++ branches/frame_order_cleanup/auto_analyses/frame_order.py   Thu Sep 25 
10:30:28 2014
@@ -235,6 +235,9 @@
 
 class Frame_order_analysis:
     """The frame order auto-analysis protocol."""
+
+    # Debugging and test suite variables.
+    _final_state = True
 
     def __init__(self, data_pipe_full=None, data_pipe_subset=None, 
pipe_bundle=None, results_dir=None, pre_run_dir=None, opt_rigid=None, 
opt_subset=None, opt_full=None, opt_mc=None, mc_sim_num=500, 
models=MODEL_LIST_NONREDUNDANT, brownian_step_size=2.0, brownian_snapshot=10, 
brownian_total=1000):
         """Perform the full frame order analysis.
@@ -355,7 +358,8 @@
             summarise(dir=self.results_dir, force=True)
 
             # Save the final program state.
-            self.interpreter.state.save('final_state', dir=self.results_dir, 
force=True)
+            if self._final_state:
+                self.interpreter.state.save('final_state', 
dir=self.results_dir, force=True)
 
         # Clean up.
         finally:

Modified: 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py?rev=26029&r1=26028&r2=26029&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py
      (original)
+++ 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py
      Thu Sep 25 10:30:28 2014
@@ -200,4 +200,5 @@
 ############
 
 # Do not change!
+Frame_order_analysis._final_state = False
 Frame_order_analysis(data_pipe_full=DATA, data_pipe_subset=SUBSET, 
pipe_bundle=PIPE_BUNDLE, results_dir=ds.tmpdir, opt_rigid=OPT_RIGID, 
opt_subset=OPT_SUBSET, opt_full=OPT_FULL, opt_mc=OPT_MC, mc_sim_num=MC_NUM, 
models=MODELS, brownian_step_size=STEP_SIZE, brownian_snapshot=SNAPSHOT, 
brownian_total=TOTAL)