[prev in list] [next in list] [prev in thread] [next in thread] 

List:       relax-commits
Subject:    r11507 - /1.3/auto_analyses/dauvergne_protocol.py
From:       edward () domain ! hid
Date:       2010-08-12 20:58:09
Message-ID: E1Ojeqn-00073o-UN () subversion ! gna ! org
[Download RAW message or body]

Author: bugman
Date: Thu Aug 12 22:58:09 2010
New Revision: 11507

URL: http://svn.gna.org/viewcvs/relax?rev=11507&view=rev
Log:
Fix for bug #13259, the failure of model elimination in the full analysis script.

The problem was that model elimination is only performed on the current data pipe, so \
it should be performed in the multi_model() method just after the optimisation of the \
individual model-free models.


Modified:
    1.3/auto_analyses/dauvergne_protocol.py

Modified: 1.3/auto_analyses/dauvergne_protocol.py
URL: http://svn.gna.org/viewcvs/relax/1.3/auto_analyses/dauvergne_protocol.py?rev=11507&r1=11506&r2=11507&view=diff
 ==============================================================================
--- 1.3/auto_analyses/dauvergne_protocol.py (original)
+++ 1.3/auto_analyses/dauvergne_protocol.py Thu Aug 12 22:58:09 2010
@@ -755,10 +755,6 @@
     def model_selection(self, modsel_pipe=None, dir=None, write_flag=True):
         """Model selection function."""
 
-        # Model elimination.
-        if modsel_pipe != 'final':
-            self.interpreter.eliminate()
-
         # Model selection (delete the model selection pipe if it already exists).
         if pipes.has_pipe(modsel_pipe):
             self.interpreter.pipe.delete(modsel_pipe)
@@ -828,6 +824,9 @@
             self.interpreter.grid_search(inc=self.grid_inc)
             self.interpreter.minimise(self.min_algor)
 
+            # Model elimination.
+            self.interpreter.eliminate()
+
             # Write the results.
             dir = self.base_dir + name
             self.interpreter.results.write(file='results', dir=dir, force=True)


[prev in list] [next in list] [prev in thread] [next in thread]