mailr24588 - /branches/zooming_grid_search/pipe_control/minimise.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on July 21, 2014 - 18:59:
Author: bugman
Date: Mon Jul 21 18:59:58 2014
New Revision: 24588

URL: http://svn.gna.org/viewcvs/relax?rev=24588&view=rev
Log:
The new pipe_control.minimise module functions can now handle models with no 
parameters.

The new assemble_scaling_matrix() and grid_setup() functions will now handle 
models with no
parameters, as this is required for the relaxation dispersion analysis.


Modified:
    branches/zooming_grid_search/pipe_control/minimise.py

Modified: branches/zooming_grid_search/pipe_control/minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/pipe_control/minimise.py?rev=24588&r1=24587&r2=24588&view=diff
==============================================================================
--- branches/zooming_grid_search/pipe_control/minimise.py       (original)
+++ branches/zooming_grid_search/pipe_control/minimise.py       Mon Jul 21 
18:59:58 2014
@@ -61,6 +61,11 @@
         # Get the parameter names.
         names = api.get_param_names(model_info)
 
+        # No parameters for this model.
+        if names == None or len(names) == 0:
+            scaling_matrix.append(None)
+            continue
+
         # The parameter number.
         n = len(names)
 
@@ -222,6 +227,13 @@
         # Get the parameter names and current values.
         names = api.get_param_names(model_info)
         values = api.get_param_values(model_info)
+
+        # No parameters for this model.
+        if names == None or len(names) == 0:
+            model_lower.append(None)
+            model_upper.append(None)
+            model_inc.append(None)
+            continue
 
         # The parameter number.
         n = len(names)




Related Messages


Powered by MHonArc, Updated Mon Jul 21 19:20:02 2014