r4744 - /branches/N_state_model/specific_fns/n_state_model.py -- January 15, 2008 - 14:30

Author: bugman
Date: Tue Jan 15 14:30:08 2008
New Revision: 4744

URL: http://svn.gna.org/viewcvs/relax?rev=4744&view=rev
Log:
Removed some old model-free code which seems to be completely useless!


Modified:
    branches/N_state_model/specific_fns/n_state_model.py

Modified: branches/N_state_model/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/n_state_model.py?rev=4744&r1=4743&r2=4744&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/n_state_model.py (original)
+++ branches/N_state_model/specific_fns/n_state_model.py Tue Jan 15 14:30:08 
2008
@@ -225,12 +225,6 @@
         # Set up the class instance containing the target function.
         model = N_state_opt(init_params=param_vector, 
red_data=red_tensor_elem, red_errors=red_tensor_err)
 
-        # Setup the minimisation algorithm when constraints are present.
-        if constraints and not search('^[Gg]rid', min_algor):
-            algor = min_options[0]
-        else:
-            algor = min_algor
-
         # Minimisation.
         if constraints:
             results = generic_minimise(func=model.func, args=(), 
x0=param_vector, min_algor=min_algor, min_options=min_options, 
func_tol=func_tol, grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, 
full_output=1, print_flag=verbosity)