Author: bugman
Date: Tue Feb 17 16:48:45 2015
New Revision: 27662
URL: http://svn.gna.org/viewcvs/relax?rev=27662&view=rev
Log:
Test suite fixes for the error checking in the monte_carlo.setup user
function.
The number of simulations has been increased from either 1 or 2 in all tests
to the minimal number
of simulations (3).
Modified:
trunk/test_suite/gui_tests/model_free.py
trunk/test_suite/system_tests/relax_disp.py
trunk/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py
trunk/test_suite/system_tests/scripts/peak_lists/ccpn_analysis.py
trunk/test_suite/system_tests/scripts/relax_disp/r1rho_off_res_tp02.py
Modified: trunk/test_suite/gui_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/model_free.py?rev=27662&r1=27661&r2=27662&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/model_free.py (original)
+++ trunk/test_suite/gui_tests/model_free.py Tue Feb 17 16:48:45 2015
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2006-2014 Edward d'Auvergne
#
+# Copyright (C) 2006-2015 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -132,7 +132,7 @@
analysis.data.diff_tensor_grid_inc = {'sphere': 5, 'prolate': 5,
'oblate': 5, 'ellipsoid': 3}
# Set the number of Monte Carlo simulations.
- analysis.mc_sim_num.SetValue(2)
+ analysis.mc_sim_num.SetValue(3)
# Set the maximum number of iterations (changing the allowed values).
analysis.max_iter.control.SetRange(0, 100)
@@ -344,7 +344,7 @@
analysis.data.diff_tensor_grid_inc = {'sphere': 5, 'prolate': 5,
'oblate': 5, 'ellipsoid': 3}
# Set the number of Monte Carlo simulations.
- analysis.mc_sim_num.SetValue(2)
+ analysis.mc_sim_num.SetValue(3)
# Set the maximum number of iterations (changing the allowed values).
analysis.max_iter.control.SetRange(0, 100)
@@ -360,7 +360,7 @@
self.assertEqual(analysis.data.local_tm_models, ['tm0', 'tm1'])
self.assertEqual(analysis.data.mf_models, ['m1', 'm2'])
self.assertEqual(analysis.data.grid_inc, 3)
- self.assertEqual(analysis.data.mc_sim_num, 2)
+ self.assertEqual(analysis.data.mc_sim_num, 3)
self.assertEqual(analysis.data.max_iter, 1)
self.assertEqual(analysis.data.diff_tensor_grid_inc['sphere'], 5)
self.assertEqual(analysis.data.diff_tensor_grid_inc['prolate'], 5)
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=27662&r1=27661&r2=27662&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Tue Feb 17 16:48:45 2015
@@ -1344,7 +1344,7 @@
pre_run_dir = status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'bug_21715_clustered_indexerror'+sep+'non_clustered'
relax_disp.Relax_disp.opt_func_tol = 1e-5
relax_disp.Relax_disp.opt_max_iterations = 1000
- relax_disp.Relax_disp(pipe_name='origin - relax_disp (Sun Feb 23
19:36:51 2014)', pipe_bundle='relax_disp (Sun Feb 23 19:36:51 2014)',
results_dir=self.tmpdir, models=['R2eff', 'No Rex'], grid_inc=11,
mc_sim_num=2, modsel='AIC', pre_run_dir=pre_run_dir, insignificance=1.0,
numeric_only=True, mc_sim_all_models=False, eliminate=True)
+ relax_disp.Relax_disp(pipe_name='origin - relax_disp (Sun Feb 23
19:36:51 2014)', pipe_bundle='relax_disp (Sun Feb 23 19:36:51 2014)',
results_dir=self.tmpdir, models=['R2eff', 'No Rex'], grid_inc=11,
mc_sim_num=3, modsel='AIC', pre_run_dir=pre_run_dir, insignificance=1.0,
numeric_only=True, mc_sim_all_models=False, eliminate=True)
def test_bug_22146_unpacking_r2a_r2b_cluster_B14(self):
@@ -5057,7 +5057,7 @@
self.interpreter.minimise.execute(min_algor='simplex',
func_tol=1e-05, max_iter=1000)
# Monte Carlo simulations.
- self.interpreter.monte_carlo.setup(number=2)
+ self.interpreter.monte_carlo.setup(number=3)
self.interpreter.monte_carlo.create_data(method='back_calc')
self.interpreter.monte_carlo.initial_values()
self.interpreter.minimise.execute(min_algor='simplex', max_iter=10)
@@ -5129,7 +5129,7 @@
self.interpreter.minimise.execute(min_algor='simplex',
func_tol=1e-05, max_iter=1000)
# Monte Carlo simulations.
- self.interpreter.monte_carlo.setup(number=2)
+ self.interpreter.monte_carlo.setup(number=3)
self.interpreter.monte_carlo.create_data(method='back_calc')
self.interpreter.monte_carlo.initial_values()
self.interpreter.minimise.execute(min_algor='simplex', max_iter=10)
@@ -5199,7 +5199,7 @@
self.interpreter.minimise.execute(min_algor='simplex',
func_tol=1e-05, max_iter=1000)
# Monte Carlo simulations.
- self.interpreter.monte_carlo.setup(number=2)
+ self.interpreter.monte_carlo.setup(number=3)
self.interpreter.monte_carlo.create_data(method='back_calc')
self.interpreter.monte_carlo.initial_values()
self.interpreter.minimise.execute(min_algor='simplex', max_iter=10)
@@ -5269,7 +5269,7 @@
self.interpreter.minimise.execute(min_algor='simplex',
func_tol=1e-05, max_iter=1000)
# Monte Carlo simulations.
- self.interpreter.monte_carlo.setup(number=2)
+ self.interpreter.monte_carlo.setup(number=3)
self.interpreter.monte_carlo.create_data(method='back_calc')
self.interpreter.monte_carlo.initial_values()
self.interpreter.minimise.execute(min_algor='simplex', max_iter=10)
@@ -5341,7 +5341,7 @@
self.interpreter.minimise.execute(min_algor='simplex',
func_tol=1e-05, max_iter=100)
# Monte Carlo simulations.
- self.interpreter.monte_carlo.setup(number=2)
+ self.interpreter.monte_carlo.setup(number=3)
self.interpreter.monte_carlo.create_data(method='back_calc')
self.interpreter.monte_carlo.initial_values()
self.interpreter.minimise.execute(min_algor='simplex', max_iter=10)
@@ -5411,7 +5411,7 @@
self.interpreter.minimise.execute(min_algor='simplex',
func_tol=1e-05, max_iter=1000)
# Monte Carlo simulations.
- self.interpreter.monte_carlo.setup(number=2)
+ self.interpreter.monte_carlo.setup(number=3)
self.interpreter.monte_carlo.create_data(method='back_calc')
self.interpreter.monte_carlo.initial_values()
self.interpreter.minimise.execute(min_algor='simplex', max_iter=10)
@@ -5508,7 +5508,7 @@
self.interpreter.minimise.execute(min_algor='simplex',
func_tol=1e-05, max_iter=10)
# Monte Carlo simulations.
- self.interpreter.monte_carlo.setup(number=2)
+ self.interpreter.monte_carlo.setup(number=3)
self.interpreter.monte_carlo.create_data(method='back_calc')
self.interpreter.monte_carlo.initial_values()
self.interpreter.minimise.execute(min_algor='simplex', max_iter=10)
Modified:
trunk/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py?rev=27662&r1=27661&r2=27662&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py
(original)
+++ trunk/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py
Tue Feb 17 16:48:45 2015
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2004-2013 Edward d'Auvergne
#
+# Copyright (C) 2004-2015 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -165,7 +165,7 @@
MIN_ALGOR = 'newton'
# The number of Monte Carlo simulations to be used for error analysis at the
end of the analysis.
-MC_NUM = 2
+MC_NUM = 3
# Automatic looping over all rounds until convergence (must be a boolean
value of True or False).
CONV_LOOP = True
Modified: trunk/test_suite/system_tests/scripts/peak_lists/ccpn_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/peak_lists/ccpn_analysis.py?rev=27662&r1=27661&r2=27662&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/peak_lists/ccpn_analysis.py
(original)
+++ trunk/test_suite/system_tests/scripts/peak_lists/ccpn_analysis.py Tue
Feb 17 16:48:45 2015
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2004-2014 Edward d'Auvergne
#
+# Copyright (C) 2004-2015 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -116,7 +116,7 @@
minimise.execute('simplex', scaling=False, constraints=False)
# Monte Carlo simulations.
-monte_carlo.setup(number=2)
+monte_carlo.setup(number=3)
monte_carlo.create_data()
monte_carlo.initial_values()
minimise.execute('simplex', scaling=False, constraints=False)
Modified:
trunk/test_suite/system_tests/scripts/relax_disp/r1rho_off_res_tp02.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/r1rho_off_res_tp02.py?rev=27662&r1=27661&r2=27662&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/relax_disp/r1rho_off_res_tp02.py
(original)
+++ trunk/test_suite/system_tests/scripts/relax_disp/r1rho_off_res_tp02.py
Tue Feb 17 16:48:45 2015
@@ -21,7 +21,7 @@
GRID_INC = 4
# The number of Monte Carlo simulations to be used for error analysis at the
end of the analysis.
-MC_NUM = 1
+MC_NUM = 3
# Set up the data pipe.
r27662 - in /trunk/test_suite: gui_tests/ system_tests/ system_tests/scripts/model_free/ system_tests/scripts/peak_lists/ sy...