r17990 - /branches/frame_order_testing/auto_analyses/frame_order.py -- November 16, 2012 - 11:19

Author: bugman
Date: Fri Nov 16 11:19:06 2012
New Revision: 17990

URL: http://svn.gna.org/viewcvs/relax?rev=17990&view=rev
Log:
Fix for the model elimination in the frame order auto-analysis.

This needs to be performed for each data pipe separately.


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=17990&r1=17989&r2=17990&view=diff
==============================================================================
--- branches/frame_order_testing/auto_analyses/frame_order.py (original)
+++ branches/frame_order_testing/auto_analyses/frame_order.py Fri Nov 16 
11:19:06 2012
@@ -100,9 +100,6 @@
             # The nested model optimisation protocol.
             self.optimise()
 
-            # Model elimination.
-            self.interpreter.eliminate()
-
             # Model selection.
             self.interpreter.model_selection(method='AIC', 
modsel_pipe='final')
 
@@ -256,6 +253,10 @@
 
             # The results file already exists, so read its contents instead.
             if self.read_results(model=model, pipe_name=self.models[model]):
+                # Re-perform model elimination just in case.
+                self.interpreter.eliminate()
+
+                # Skip to the next model.
                 continue
 
             # Create the data pipe using the full data set, and switch to it.
@@ -291,6 +292,9 @@
 
             # Results printout.
             self.print_results()
+
+            # Model elimination.
+            self.interpreter.eliminate()
 
             # Save the results.
             self.interpreter.results.write(dir=model, force=True)