Author: bugman Date: Sat Mar 22 19:03:06 2008 New Revision: 5149 URL: http://svn.gna.org/viewcvs/relax?rev=5149&view=rev Log: Converted the model-free overfit_deselect() method to use booleans. Modified: 1.3/specific_fns/model_free/model_free.py Modified: 1.3/specific_fns/model_free/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/model_free.py?rev=5149&r1=5148&r2=5149&view=diff ============================================================================== --- 1.3/specific_fns/model_free/model_free.py (original) +++ 1.3/specific_fns/model_free/model_free.py Sat Mar 22 19:03:06 2008 @@ -1601,27 +1601,27 @@ cdp = relax_data_store[relax_data_store.current_pipe] # Is structural data required? - need_vect = 0 + need_vect = False if hasattr(cdp, 'diff') and (cdp.diff.type == 'spheroid' or cdp.diff.type == 'ellipsoid'): - need_vect = 1 + need_vect = True # Loop over the sequence. for spin in spin_loop(): # Relaxation data must exist! if not hasattr(spin, 'relax_data'): - spin.select = 0 + spin.select = False # Require 3 or more relaxation data points. elif len(spin.relax_data) < 3: - spin.select = 0 + spin.select = False # Require at least as many data points as params to prevent over-fitting. elif hasattr(spin, 'params') and len(spin.params) > len(spin.relax_data): - spin.select = 0 + spin.select = False # Test for structural data if required. elif not hasattr(spin, 'xh_vect'): - spin.select = 0 + spin.select = False def read_columnar_col_numbers(self, header):