r18330 - in /branches/frame_order_testing: ./ specific_fns/model_free/ test_suite/shared_data/saved_states/ test_suite/syste... -- February 01, 2013 - 11:22

Author: bugman
Date: Fri Feb  1 11:22:51 2013
New Revision: 18330

URL: http://svn.gna.org/viewcvs/relax?rev=18330&view=rev
Log:
Merged revisions 18328-18329 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18328 | bugman | 2013-02-01 11:19:09 +0100 (Fri, 01 Feb 2013) | 6 lines
  
  Created the Mf.test_bug_20464_missing_ri_data system test to catch bug 
#20464.
  
  The data comes from the bug report submitted by Stanislava Panova (stpanova 
att gmail dot com) at
  https://gna.org/bugs/?20464.
........
  r18329 | bugman | 2013-02-01 11:22:16 +0100 (Fri, 01 Feb 2013) | 7 lines
  
  Fix for bug #20464 (https://gna.org/bugs/?20464).
  
  The problem was the previously missing data had a value of None whereas now 
the dictionary element
  can be missing.  Checks have been added to make sure the spin specific 
relaxation data structures
  have the key corresponding to the data.
........

Added:
    
branches/frame_order_testing/test_suite/shared_data/saved_states/bug_20464_mf_missing_ri_data.bz2
      - copied unchanged from r18329, 
trunk/test_suite/shared_data/saved_states/bug_20464_mf_missing_ri_data.bz2
    
branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20464_missing_ri_data.py
      - copied unchanged from r18329, 
trunk/test_suite/system_tests/scripts/model_free/bug_20464_missing_ri_data.py
Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/specific_fns/model_free/mf_minimise.py
    branches/frame_order_testing/test_suite/system_tests/model_free.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb  1 11:22:51 2013
@@ -1,1 +1,1 @@
-/trunk:1-18326
+/trunk:1-18329

Modified: branches/frame_order_testing/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/mf_minimise.py?rev=18330&r1=18329&r2=18330&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/model_free/mf_minimise.py 
(original)
+++ branches/frame_order_testing/specific_fns/model_free/mf_minimise.py Fri 
Feb  1 11:22:51 2013
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2003-2012 Edward d'Auvergne                                  
 #
+# Copyright (C) 2003-2013 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -1083,6 +1083,10 @@
 
             # Make sure that the errors are strictly positive numbers.
             for ri_id in cdp.ri_ids:
+                # Skip missing data.
+                if not ri_id in spin.ri_data_err:
+                    continue
+
                 # Alias.
                 err = spin.ri_data_err[ri_id]
 
@@ -1213,6 +1217,10 @@
 
         # Loop over the relaxation data.
         for ri_id in cdp.ri_ids:
+            # Skip missing data.
+            if ri_id not in spin.ri_data:
+                continue
+
             # The Rx data.
             if sim_index == None:
                 data = spin.ri_data[ri_id]

Modified: branches/frame_order_testing/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/model_free.py?rev=18330&r1=18329&r2=18330&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/model_free.py 
(original)
+++ branches/frame_order_testing/test_suite/system_tests/model_free.py Fri 
Feb  1 11:22:51 2013
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2012 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2013 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -281,6 +281,16 @@
 
         # Execute the script.
         self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'model_free'+sep+'bug_20213_asn_sidechain.py')
+
+
+    def test_bug_20464_missing_ri_data(self):
+        """Bug #20464 catch (https://gna.org/bugs/?20464), the failure due 
to missing relaxation data."""
+
+        # Clear the data store.
+        self.interpreter.reset()
+
+        # Execute the script.
+        self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'model_free'+sep+'bug_20464_missing_ri_data.py')
 
 
     def test_create_m4(self):