r22700 - in /trunk/test_suite/system_tests/scripts/n_state_model: lactose_n_state.py populations.py -- April 10, 2014 - 19:50

Author: bugman
Date: Thu Apr 10 19:50:10 2014
New Revision: 22700

URL: http://svn.gna.org/viewcvs/relax?rev=22700&view=rev
Log:
Converted the remaining N-state model system tests to use the new value.set 
index argument.


Modified:
    trunk/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py
    trunk/test_suite/system_tests/scripts/n_state_model/populations.py

Modified: 
trunk/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py?rev=22700&r1=22699&r2=22700&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py    
  (original)
+++ trunk/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py    
  Thu Apr 10 19:50:10 2014
@@ -92,7 +92,7 @@
 # Set to equal probabilities.
 if ds.model == 'population':
     for j in range(NUM_STR):
-        self._execute_uf(1.0/NUM_STR, 'p'+repr(j), uf_name='value.set')
+        self._execute_uf(uf_name='value.set', val=1.0/NUM_STR, 
param='probs', index=j)
 
 # Minimisation.
 self._execute_uf('bfgs', constraints=True, max_iter=5, uf_name='minimise')

Modified: trunk/test_suite/system_tests/scripts/n_state_model/populations.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/populations.py?rev=22700&r1=22699&r2=22700&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/n_state_model/populations.py  
(original)
+++ trunk/test_suite/system_tests/scripts/n_state_model/populations.py  Thu 
Apr 10 19:50:10 2014
@@ -88,9 +88,9 @@
 self._execute_uf(uf_name='n_state_model.select_model', model='population')
 
 # Set pc to the exact values.
-self._execute_uf(uf_name='value.set', val=0.3, param='p0')
-self._execute_uf(uf_name='value.set', val=0.1, param='p2')
-self._execute_uf(uf_name='value.set', val=0.6, param='p1')
+self._execute_uf(uf_name='value.set', val=0.3, param='probs', index=0)
+self._execute_uf(uf_name='value.set', val=0.1, param='probs', index=2)
+self._execute_uf(uf_name='value.set', val=0.6, param='probs', index=1)
 
 # Set the tensors.
 self._execute_uf(uf_name='align_tensor.init', tensor=align_list[0], params=( 
1.42219822168827662867e-04, -1.44543001566521341940e-04, 
-7.07796211648713973798e-04, -6.01619494082773244303e-04,  
2.02008007072950861996e-04), align_id=align_list[0], param_types=2)
@@ -109,7 +109,7 @@
 ###########################
 
 # Change a probability
-self._execute_uf(uf_name='value.set', val=0.6005, param='p1')
+self._execute_uf(uf_name='value.set', val=0.6005, param='probs', index=1)
 
 # Minimisation.
 self._execute_uf(uf_name='minimise', min_algor='bfgs', max_iter=500)