r12676 - /branches/relax_data/specific_fns/model_free/main.py -- March 01, 2011 - 19:22

Author: bugman
Date: Tue Mar  1 19:22:25 2011
New Revision: 12676

URL: http://svn.gna.org/viewcvs/relax?rev=12676&view=rev
Log:
Updated the model-free overfit_deselect() method for the new relaxation data 
structures.


Modified:
    branches/relax_data/specific_fns/model_free/main.py

Modified: branches/relax_data/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/specific_fns/model_free/main.py?rev=12676&r1=12675&r2=12676&view=diff
==============================================================================
--- branches/relax_data/specific_fns/model_free/main.py (original)
+++ branches/relax_data/specific_fns/model_free/main.py Tue Mar  1 19:22:25 
2011
@@ -2041,17 +2041,17 @@
         # Loop over the sequence.
         for spin, spin_id in spin_loop(return_id=True):
             # Relaxation data must exist!
-            if not hasattr(spin, 'relax_data'):
+            if not hasattr(spin, 'ri_data'):
                 warn(RelaxDeselectWarning(spin_id, 'missing relaxation 
data'))
                 spin.select = False
 
             # Require 3 or more relaxation data points.
-            elif len(spin.relax_data) < 3:
+            elif len(spin.ri_data) < 3:
                 warn(RelaxDeselectWarning(spin_id, 'insufficient relaxation 
data, 3 or more data points are required'))
                 spin.select = False
 
             # Require at least as many data points as params to prevent 
over-fitting.
-            elif hasattr(spin, 'params') and spin.params and 
len(spin.params) > len(spin.relax_data):
+            elif hasattr(spin, 'params') and spin.params and 
len(spin.params) > len(spin.ri_data):
                 warn(RelaxDeselectWarning(spin_id, 'over-fitting - more 
parameters than data points'))
                 spin.select = False