r25753 - /branches/frame_order_cleanup/auto_analyses/frame_order.py -- September 11, 2014 - 19:57

Author: bugman
Date: Thu Sep 11 19:57:46 2014
New Revision: 25753

URL: http://svn.gna.org/viewcvs/relax?rev=25753&view=rev
Log:
Simplified the optimisation in the axis permutation part of the frame order 
auto-analysis.

Only the last, highest quality setting is used for optimisation.


Modified:
    branches/frame_order_cleanup/auto_analyses/frame_order.py

Modified: branches/frame_order_cleanup/auto_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/frame_order.py?rev=25753&r1=25752&r2=25753&view=diff
==============================================================================
--- branches/frame_order_cleanup/auto_analyses/frame_order.py   (original)
+++ branches/frame_order_cleanup/auto_analyses/frame_order.py   Thu Sep 11 
19:57:46 2014
@@ -212,16 +212,18 @@
             # Permute the axes.
             self.interpreter.frame_order.permute_axes(permutation=perm)
 
-            # Minimise (for the full data set).
+            # Minimise with only the last optimisation settings (for the 
full data set).
             opt = self.opt_full
             for i in opt.loop_min():
-                # The numerical optimisation settings.
-                num_int_pts = opt.get_min_num_int_pts(i)
-                if num_int_pts != None:
-                    self.interpreter.frame_order.num_int_pts(num=num_int_pts)
-
-                # Perform the optimisation.
-                
self.interpreter.minimise.execute(min_algor=opt.get_min_algor(i), 
func_tol=opt.get_min_func_tol(i), max_iter=opt.get_min_max_iter(i))
+                pass
+
+            # The numerical optimisation settings.
+            num_int_pts = opt.get_min_num_int_pts(i)
+            if num_int_pts != None:
+                self.interpreter.frame_order.num_int_pts(num=num_int_pts)
+
+            # Perform the optimisation.
+            
self.interpreter.minimise.execute(min_algor=opt.get_min_algor(i), 
func_tol=opt.get_min_func_tol(i), max_iter=opt.get_min_max_iter(i))
 
             # Results printout.
             self.print_results()