Author: bugman
Date: Tue Sep 25 15:01:37 2012
New Revision: 17558
URL: http://svn.gna.org/viewcvs/relax?rev=17558&view=rev
Log:
All overfit_deselect() methods now accept and use the verbose argument.
Modified:
trunk/specific_fns/api_base.py
trunk/specific_fns/api_common.py
trunk/specific_fns/consistency_tests.py
trunk/specific_fns/jw_mapping.py
trunk/specific_fns/noe/main.py
trunk/specific_fns/relax_fit.py
Modified: trunk/specific_fns/api_base.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/api_base.py?rev=17558&r1=17557&r2=17558&view=diff
==============================================================================
--- trunk/specific_fns/api_base.py (original)
+++ trunk/specific_fns/api_base.py Tue Sep 25 15:01:37 2012
@@ -463,11 +463,13 @@
raise RelaxImplementError('num_instances')
- def overfit_deselect(self, data_check=True):
+ def overfit_deselect(self, data_check=True, verbose=True):
"""Deselect models with insufficient data for minimisation.
@keyword data_check: A flag to signal if the presence of base
data is to be checked for.
@type data_check: bool
+ @keyword verbose: A flag which if True will allow printouts.
+ @type verbose: bool
"""
# Not implemented.
Modified: trunk/specific_fns/api_common.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/api_common.py?rev=17558&r1=17557&r2=17558&view=diff
==============================================================================
--- trunk/specific_fns/api_common.py (original)
+++ trunk/specific_fns/api_common.py Tue Sep 25 15:01:37 2012
@@ -208,7 +208,7 @@
return count_spins()
- def _overfit_deselect_dummy(self, data_check=True):
+ def _overfit_deselect_dummy(self, data_check=True, verbose=True):
"""Dummy method, normally for deselecting spins with insufficient
data for minimisation."""
Modified: trunk/specific_fns/consistency_tests.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/consistency_tests.py?rev=17558&r1=17557&r2=17558&view=diff
==============================================================================
--- trunk/specific_fns/consistency_tests.py (original)
+++ trunk/specific_fns/consistency_tests.py Tue Sep 25 15:01:37 2012
@@ -286,15 +286,18 @@
default_value_doc.add_table(_table.label)
- def overfit_deselect(self, data_check=True):
+ def overfit_deselect(self, data_check=True, verbose=True):
"""Deselect spins which have insufficient data to support
calculation.
@keyword data_check: A flag to signal if the presence of base
data is to be checked for.
@type data_check: bool
+ @keyword verbose: A flag which if True will allow printouts.
+ @type verbose: bool
"""
# Print out.
- print("\n\nOver-fit spin deselection.\n")
+ if verbose:
+ print("\n\nOver-fit spin deselection.\n")
# Test the sequence data exists.
if not exists_mol_res_spin_data():
Modified: trunk/specific_fns/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/jw_mapping.py?rev=17558&r1=17557&r2=17558&view=diff
==============================================================================
--- trunk/specific_fns/jw_mapping.py (original)
+++ trunk/specific_fns/jw_mapping.py Tue Sep 25 15:01:37 2012
@@ -270,15 +270,18 @@
default_value_doc.add_table(_table.label)
- def overfit_deselect(self, data_check=True):
+ def overfit_deselect(self, data_check=True, verbose=True):
"""Deselect spins which _have insufficient data to support
calculation.
@keyword data_check: A flag to signal if the presence of base
data is to be checked for.
@type data_check: bool
+ @keyword verbose: A flag which if True will allow printouts.
+ @type verbose: bool
"""
# Print out.
- print("\n\nOver-fit spin deselection.\n")
+ if verbose:
+ print("\n\nOver-fit spin deselection.\n")
# Test the sequence data exists.
if not exists_mol_res_spin_data():
Modified: trunk/specific_fns/noe/main.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/noe/main.py?rev=17558&r1=17557&r2=17558&view=diff
==============================================================================
--- trunk/specific_fns/noe/main.py (original)
+++ trunk/specific_fns/noe/main.py Tue Sep 25 15:01:37 2012
@@ -140,15 +140,18 @@
spin.noe_err = sqrt((sat_err * ref)**2 + (ref_err * sat)**2) /
ref**2
- def overfit_deselect(self, data_check=True):
+ def overfit_deselect(self, data_check=True, verbose=True):
"""Deselect spins which have insufficient data to support
calculation.
@keyword data_check: A flag to signal if the presence of base
data is to be checked for.
@type data_check: bool
+ @keyword verbose: A flag which if True will allow printouts.
+ @type verbose: bool
"""
# Print out.
- print("\n\nOver-fit spin deselection.\n")
+ if verbose:
+ print("\n\nOver-fit spin deselection.\n")
# Test the sequence data exists.
if not exists_mol_res_spin_data():
Modified: trunk/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/relax_fit.py?rev=17558&r1=17557&r2=17558&view=diff
==============================================================================
--- trunk/specific_fns/relax_fit.py (original)
+++ trunk/specific_fns/relax_fit.py Tue Sep 25 15:01:37 2012
@@ -803,15 +803,18 @@
spin.warning = warning
- def overfit_deselect(self, data_check=True):
+ def overfit_deselect(self, data_check=True, verbose=True):
"""Deselect spins which have insufficient data to support
minimisation.
@keyword data_check: A flag to signal if the presence of base
data is to be checked for.
@type data_check: bool
+ @keyword verbose: A flag which if True will allow printouts.
+ @type verbose: bool
"""
# Print out.
- print("\n\nOver-fit spin deselection.\n")
+ if verbose:
+ print("\n\nOver-fit spin deselection.\n")
# Test the sequence data exists.
if not exists_mol_res_spin_data():
r17558 - in /trunk/specific_fns: api_base.py api_common.py consistency_tests.py jw_mapping.py noe/main.py relax_fit.py