r24708 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/relax_disp.py -- July 24, 2014 - 15:09

Author: bugman
Date: Thu Jul 24 15:09:48 2014
New Revision: 24708

URL: http://svn.gna.org/viewcvs/relax?rev=24708&view=rev
Log:
Merged revisions 24707 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r24707 | bugman | 2014-07-24 14:06:40 +0200 (Thu, 24 Jul 2014) | 5 lines
  
  Fixes for some relaxation dispersion system tests not converted to the new 
optimisation user functions.
  
  Minimisation is now via the minimise.execute user function, which used to 
be the minimise user function.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 24 15:09:48 2014
@@ -1 +1 @@
-/trunk:1-24705
+/trunk:1-24707

Modified: branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py?rev=24708&r1=24707&r2=24708&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  Thu 
Jul 24 15:09:48 2014
@@ -736,7 +736,7 @@
             self.interpreter.relax_disp.cluster(cluster_id='all', 
spin_id=":1-100")
 
         # Low precision optimisation.
-        self.interpreter.minimise(min_algor='simplex', line_search=None, 
hessian_mod=None, hessian_type=None, func_tol=1e-05, grad_tol=None, 
max_iter=1000, constraints=True, scaling=True, verbosity=1)
+        self.interpreter.minimise.execute(min_algor='simplex', 
line_search=None, hessian_mod=None, hessian_type=None, func_tol=1e-05, 
grad_tol=None, max_iter=1000, constraints=True, scaling=True, verbosity=1)
 
         # Printout.
         print("\n\nOptimised parameters:\n")
@@ -4806,7 +4806,7 @@
         self.interpreter.relax_disp.select_model(model='R2eff')
         self.interpreter.minimise.grid_search(lower=None, upper=None, 
inc=GRID_INC, constraints=True, verbosity=1)
 
-        self.interpreter.minimise(min_algor='simplex', line_search=None, 
hessian_mod=None, hessian_type=None, func_tol=OPT_FUNC_TOL, grad_tol=None, 
max_iter=OPT_MAX_ITERATIONS, constraints=True, scaling=True, verbosity=1)
+        self.interpreter.minimise.execute(min_algor='simplex', 
line_search=None, hessian_mod=None, hessian_type=None, func_tol=OPT_FUNC_TOL, 
grad_tol=None, max_iter=OPT_MAX_ITERATIONS, constraints=True, scaling=True, 
verbosity=1)
         self.interpreter.eliminate(function=None, args=None)
         self.interpreter.monte_carlo.setup(number=MC_NUM)
         self.interpreter.monte_carlo.create_data(method='back_calc')