r18278 - in /branches/frame_order_testing: ./ specific_fns/n_state_model.py test_suite/system_tests/n_state_model.py -- January 23, 2013 - 18:32

Author: bugman
Date: Wed Jan 23 18:32:17 2013
New Revision: 18278

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

........
  r18275 | bugman | 2013-01-23 17:39:04 +0100 (Wed, 23 Jan 2013) | 3 lines
  
  Removed a duplicated comment.
........
  r18277 | bugman | 2013-01-23 18:14:33 +0100 (Wed, 23 Jan 2013) | 6 lines
  
  BFGS optimisation is now being used for the 
N_state_model.test_mc_sim_failure system test.
  
  This is to have better test coverage of the paramagnetic centre position 
optimisation gradient code
  paths.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/specific_fns/n_state_model.py
    branches/frame_order_testing/test_suite/system_tests/n_state_model.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 23 18:32:17 2013
@@ -1,1 +1,1 @@
-/trunk:1-18274
+/trunk:1-18277

Modified: branches/frame_order_testing/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/n_state_model.py?rev=18278&r1=18277&r2=18278&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/n_state_model.py (original)
+++ branches/frame_order_testing/specific_fns/n_state_model.py Wed Jan 23 
18:32:17 2013
@@ -1357,7 +1357,6 @@
         if hasattr(cdp, 'pcs_ids'):
             ids += cdp.pcs_ids
 
-        # No RDC or PCS data for the alignment, so skip the tensor as it 
will not be optimised.
         # No RDC or PCS data for the alignment, so skip the tensor as it 
will not be optimised.
         if tensor.align_id not in ids:
             return False

Modified: 
branches/frame_order_testing/test_suite/system_tests/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/n_state_model.py?rev=18278&r1=18277&r2=18278&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/n_state_model.py 
(original)
+++ branches/frame_order_testing/test_suite/system_tests/n_state_model.py Wed 
Jan 23 18:32:17 2013
@@ -526,7 +526,7 @@
         self.interpreter.monte_carlo.setup(number=3)
         self.interpreter.monte_carlo.create_data()
         self.interpreter.monte_carlo.initial_values()
-        self.interpreter.minimise('simplex', constraints=False, max_iter=100)
+        self.interpreter.minimise('bfgs', constraints=False, max_iter=100)
         self.interpreter.monte_carlo.error_analysis()