r7647 - in /1.3: generic_fns/model_selection.py specific_fns/model_free/main.py -- October 12, 2008 - 15:17

Author: bugman
Date: Sun Oct 12 15:17:44 2008
New Revision: 7647

URL: http://svn.gna.org/viewcvs/relax?rev=7647&view=rev
Log:
Changes to the model selection print out.


Modified:
    1.3/generic_fns/model_selection.py
    1.3/specific_fns/model_free/main.py

Modified: 1.3/generic_fns/model_selection.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/model_selection.py?rev=7647&r1=7646&r2=7647&view=diff
==============================================================================
--- 1.3/generic_fns/model_selection.py (original)
+++ 1.3/generic_fns/model_selection.py Sun Oct 12 15:17:44 2008
@@ -214,7 +214,7 @@
     # Loop over the base models.
     for model_info in model_loop():
         # Print out.
-        print "\nModel: " + `model_desc(model_info)` + ".\n"
+        print "\n" + model_desc(model_info)
         print "%-20s %-20s %-20s %-20s %-20s" % ("Data pipe", 
"Num_params_(k)", "Num_data_sets_(n)", "Chi2", "Criterion")
 
         # Initial model.
@@ -284,7 +284,7 @@
                 best_crit = crit
 
         # Print out of selected model.
-        print "\nThe model from the data pipe " + `best_model` + " has been 
selected."
+        print "The model from the data pipe " + `best_model` + " has been 
selected."
 
         # Duplicate the data from the 'best_model' to the model selection 
data pipe.
         if best_model != None:

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=7647&r1=7646&r2=7647&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Sun Oct 12 15:17:44 2008
@@ -1712,8 +1712,8 @@
             # Get the spin container.
             spin, spin_id = return_spin_from_index(model_index, 
return_spin_id=True)
 
-            # Return the spin id.
-            return spin_id
+            # Return the description.
+            return "Model-free model of spin '%s'." % spin_id
 
 
     def model_loop(self):