r18020 - /branches/frame_order_testing/auto_analyses/frame_order.py -- November 22, 2012 - 15:56

Author: bugman
Date: Thu Nov 22 15:56:44 2012
New Revision: 18020

URL: http://svn.gna.org/viewcvs/relax?rev=18020&view=rev
Log:
The final results file is now checked for by the frame order auto-analysis.

This allows the model selection and Monte Carlo simulations to be skipped if 
already run.


Modified:
    branches/frame_order_testing/auto_analyses/frame_order.py

Modified: branches/frame_order_testing/auto_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/auto_analyses/frame_order.py?rev=18020&r1=18019&r2=18020&view=diff
==============================================================================
--- branches/frame_order_testing/auto_analyses/frame_order.py (original)
+++ branches/frame_order_testing/auto_analyses/frame_order.py Thu Nov 22 
15:56:44 2012
@@ -122,22 +122,24 @@
             # The nested model optimisation protocol.
             self.optimise()
 
-            # Model selection.
-            self.interpreter.model_selection(method='AIC', 
modsel_pipe='final', pipes=self.pipes)
-
-            # The number of integration points.
-            self.interpreter.frame_order.num_int_pts(num=self.mc_int_pts)
-
-            # Monte Carlo simulations.
-            self.interpreter.monte_carlo.setup(number=self.mc_sim_num)
-            self.interpreter.monte_carlo.create_data()
-            self.interpreter.monte_carlo.initial_values()
-            self.interpreter.minimise(self.min_algor, 
func_tol=self.mc_func_tol, constraints=False)
-            self.interpreter.eliminate()
-            self.interpreter.monte_carlo.error_analysis()
-
-            # Finish.
-            self.interpreter.results.write(file='results', force=True)
+            # The final results does not already exist.
+            if not self.read_results(model='final', pipe_name='final'):
+                # Model selection.
+                self.interpreter.model_selection(method='AIC', 
modsel_pipe='final', pipes=self.pipes)
+
+                # The number of integration points.
+                self.interpreter.frame_order.num_int_pts(num=self.mc_int_pts)
+
+                # Monte Carlo simulations.
+                self.interpreter.monte_carlo.setup(number=self.mc_sim_num)
+                self.interpreter.monte_carlo.create_data()
+                self.interpreter.monte_carlo.initial_values()
+                self.interpreter.minimise(self.min_algor, 
func_tol=self.mc_func_tol, constraints=False)
+                self.interpreter.eliminate()
+                self.interpreter.monte_carlo.error_analysis()
+
+                # Finish.
+                self.interpreter.results.write(file='results', force=True)
 
             # Results visualisation.
             self.visualisation()