r17993 - /branches/frame_order_testing/specific_fns/frame_order.py -- November 16, 2012 - 11:46

Author: bugman
Date: Fri Nov 16 11:46:33 2012
New Revision: 17993

URL: http://svn.gna.org/viewcvs/relax?rev=17993&view=rev
Log:
Implemented the model_desc() and model_type() frame order specific methods.

These are needed for model selection.


Modified:
    branches/frame_order_testing/specific_fns/frame_order.py

Modified: branches/frame_order_testing/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/frame_order.py?rev=17993&r1=17992&r2=17993&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Fri Nov 16 
11:46:33 2012
@@ -2014,6 +2014,17 @@
         self._store_bc_data(model)
 
 
+    def model_desc(self, model_info):
+        """Return a description of the model.
+
+        @param model_info:  The model index from model_loop().
+        @type model_info:   int
+        @return:            The model description.
+        @rtype:             str
+        """
+
+        return ""
+
 
     def model_loop(self):
         """Dummy generator method.
@@ -2066,6 +2077,16 @@
         return k, n, chi2
 
 
+    def model_type(self):
+        """Return the type of the model, either being 'local' or 'global'.
+
+        @return:            The model type, one of 'local' or 'global'.
+        @rtype:             str
+        """
+
+        return 'global'
+
+
     def return_error(self, data_id):
         """Return the alignment tensor error structure.