r21636 - /branches/relax_disp/auto_analyses/relax_disp.py -- November 25, 2013 - 10:49

Author: bugman
Date: Mon Nov 25 10:49:41 2013
New Revision: 21636

URL: http://svn.gna.org/viewcvs/relax?rev=21636&view=rev
Log:
Model elimination is now activated in the dispersion auto-analysis.


Modified:
    branches/relax_disp/auto_analyses/relax_disp.py

Modified: branches/relax_disp/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/auto_analyses/relax_disp.py?rev=21636&r1=21635&r2=21636&view=diff
==============================================================================
--- branches/relax_disp/auto_analyses/relax_disp.py (original)
+++ branches/relax_disp/auto_analyses/relax_disp.py Mon Nov 25 10:49:41 2013
@@ -299,12 +299,16 @@
         # Minimise.
         self.interpreter.minimise('simplex', func_tol=self.opt_func_tol, 
max_iter=self.opt_max_iterations, constraints=True)
 
+        # Model elimination.
+        self.interpreter.eliminate()
+
         # Monte Carlo simulations.
         if self.mc_sim_all_models or len(self.models) < 2 or model == 
'R2eff':
             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('simplex', func_tol=self.opt_func_tol, 
max_iter=self.opt_max_iterations, constraints=True)
+            self.interpreter.eliminate()
             self.interpreter.monte_carlo.error_analysis()
 
 
@@ -402,6 +406,7 @@
                 self.interpreter.monte_carlo.create_data()
                 self.interpreter.monte_carlo.initial_values()
                 self.interpreter.minimise('simplex', 
func_tol=self.opt_func_tol, max_iter=self.opt_max_iterations, 
constraints=True)
+                self.interpreter.eliminate()
                 self.interpreter.monte_carlo.error_analysis()
 
             # Writing out the final results.