r25428 - /trunk/test_suite/system_tests/relax_disp.py -- August 29, 2014 - 12:40

Author: tlinnet
Date: Fri Aug 29 12:40:05 2014
New Revision: 25428

URL: http://svn.gna.org/viewcvs/relax?rev=25428&view=rev
Log:
Fix to systemtest test_estimate_r2eff_err_methods, after modification of 
weighting.

task #7822(https://gna.org/task/index.php?7822): Implement user function to 
estimate R2eff and associated errors for exponential curve fitting.

Modified:
    trunk/test_suite/system_tests/relax_disp.py

Modified: trunk/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=25428&r1=25427&r2=25428&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Fri Aug 29 12:40:05 2014
@@ -3098,12 +3098,13 @@
 
         # Now do it manually.
         estimate_r2eff(method='scipy.optimize.leastsq')
-        estimate_r2eff(method='minfx', min_algor='simplex', c_code=True, 
constraints=False)
-        estimate_r2eff(method='minfx', min_algor='simplex', c_code=False, 
constraints=False)
-        estimate_r2eff(method='minfx', min_algor='BFGS', c_code=True, 
constraints=False)
-        estimate_r2eff(method='minfx', min_algor='BFGS', c_code=False, 
constraints=False)
-        estimate_r2eff(method='minfx', min_algor='Newton', c_code=True, 
constraints=False)
+        estimate_r2eff(method='minfx', min_algor='simplex', c_code=True, 
constraints=False, chi2_jacobian=True)
+        estimate_r2eff(method='minfx', min_algor='simplex', c_code=False, 
constraints=False, chi2_jacobian=True)
+        estimate_r2eff(method='minfx', min_algor='simplex', c_code=False, 
constraints=False, chi2_jacobian=False)
+        estimate_r2eff(method='minfx', min_algor='BFGS', c_code=True, 
constraints=False, chi2_jacobian=True)
         estimate_r2eff(method='minfx', min_algor='BFGS', c_code=False, 
constraints=False, chi2_jacobian=True)
+        estimate_r2eff(method='minfx', min_algor='BFGS', c_code=False, 
constraints=False, chi2_jacobian=False)
+        estimate_r2eff(method='minfx', min_algor='Newton', c_code=True, 
constraints=False, chi2_jacobian=True)
 
 
     def test_exp_fit(self):