Author: bugman Date: Thu Apr 10 19:26:50 2014 New Revision: 22698 URL: http://svn.gna.org/viewcvs/relax?rev=22698&view=rev Log: Converted the N_state_model.test_5_state_xz system test to use a new way to set parameters. Instead of using pseudo-parameters for the value.set user function such as 'p0', 'p1', etc. for the probabilities, which are then converted into the 'probs' parameter with the index taken from the name, instead the index is now directly given. The value.set user function will need to be modified to handle this. The aim is to standardise the parameter list object for the N-state model analysis. Modified: trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py Modified: trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py?rev=22698&r1=22697&r2=22698&view=diff ============================================================================== --- trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py (original) +++ trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py Thu Apr 10 19:26:50 2014 @@ -65,10 +65,10 @@ # Set the initial parameter values to the actual values (the grid search is too expensive). for i in range(5): - self._execute_uf(0.2, 'p'+repr(i), uf_name='value.set') - self._execute_uf(0.0, 'alpha'+repr(i), uf_name='value.set') - self._execute_uf(pi/4-pi/8*i, 'beta'+repr(i), uf_name='value.set') - self._execute_uf(0.0, 'gamma'+repr(i), uf_name='value.set') + self._execute_uf(uf_name='value.set', val=0.2, param='probs', index=i) + self._execute_uf(uf_name='value.set', val=0.0, param='alpha', index=i) + self._execute_uf(uf_name='value.set', val=pi/4-pi/8*i, param='beta', index=i) + self._execute_uf(uf_name='value.set', val=0.0, param='gamma', index=i) #self._execute_uf(uf_name='value.set') # Minimise.