r19808 - in /branches/relax_disp: gui/analyses/auto_relax_disp.py test_suite/gui_tests/relax_disp.py -- May 30, 2013 - 20:00

Author: bugman
Date: Thu May 30 20:00:30 2013
New Revision: 19808

URL: http://svn.gna.org/viewcvs/relax?rev=19808&view=rev
Log:
Big speed ups of the Relax_disp.test_hansen_trunc_data GUI test.

The optimisation function tolerance and maximum number of iterations are now 
set to the same
low precision as the system tests.  This involves adding hidden variables to 
the dispersion GUI
analysis.


Modified:
    branches/relax_disp/gui/analyses/auto_relax_disp.py
    branches/relax_disp/test_suite/gui_tests/relax_disp.py

Modified: branches/relax_disp/gui/analyses/auto_relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_relax_disp.py?rev=19808&r1=19807&r2=19808&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Thu May 30 20:00:30 
2013
@@ -141,6 +141,11 @@
         # Execute the base class method to build the panel.
         super(Auto_relax_disp, self).__init__(parent, id=id, pos=pos, 
size=size, style=style, name=name)
 
+        # Optimisation variables for speeding up the test suite.
+        self.opt_func_tol = 1e-25
+        self.opt_max_iterations = int(1e7)
+
+
 
     def activate(self):
         """Activate or deactivate certain elements of the analysis in 
response to the execution lock."""
@@ -192,6 +197,10 @@
 
         # The number of Monte Carlo simulations to be used for error 
analysis at the end of the analysis.
         data.mc_sim_num = gui_to_int(self.mc_sim_num.GetValue())
+
+        # Optimisation precision.
+        data.opt_func_tol = self.opt_func_tol
+        data.opt_max_iterations = self.opt_max_iterations
 
         # Return the container and list of missing data.
         return data, missing
@@ -418,6 +427,10 @@
 
     def run_analysis(self):
         """Execute the calculation."""
+
+        # Optimisation precision.
+        Relax_disp.opt_func_tol = self.data.opt_func_tol
+        Relax_disp.opt_max_iterations = self.data.opt_max_iterations
 
         # Execute.
         Relax_disp(pipe_name=self.data.pipe_name, 
pipe_bundle=self.data.pipe_bundle, results_dir=self.data.save_dir, 
models=self.data.models, grid_inc=self.data.inc, 
mc_sim_num=self.data.mc_sim_num)

Modified: branches/relax_disp/test_suite/gui_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/relax_disp.py?rev=19808&r1=19807&r2=19808&view=diff
==============================================================================
--- branches/relax_disp/test_suite/gui_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/gui_tests/relax_disp.py Thu May 30 
20:00:30 2013
@@ -208,6 +208,10 @@
         analysis.grid_inc.SetValue(4)
         analysis.mc_sim_num.SetValue(3)
 
+        # Optimisation speedups.
+        analysis.opt_func_tol = 1e-5
+        analysis.opt_max_iterations = 1000
+
         # Execute relax.
         analysis.execute(wx.CommandEvent(wx.wxEVT_COMMAND_BUTTON_CLICKED, 
analysis.button_exec_relax.GetId()))