r4502 - in /branches/N_state_model: maths_fns/n_state_model.py specific_fns/n_state_model.py -- January 08, 2008 - 17:27

Author: bugman
Date: Tue Jan  8 17:27:35 2008
New Revision: 4502

URL: http://svn.gna.org/viewcvs/relax?rev=4502&view=rev
Log:
Renamed the class containing the target function from N_state_model to 
N_state_opt.

The name N_state_model was clashing with the class N_state_model of the 
specific_fns.n_state_model
module.


Modified:
    branches/N_state_model/maths_fns/n_state_model.py
    branches/N_state_model/specific_fns/n_state_model.py

Modified: branches/N_state_model/maths_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/n_state_model.py?rev=4502&r1=4501&r2=4502&view=diff
==============================================================================
--- branches/N_state_model/maths_fns/n_state_model.py (original)
+++ branches/N_state_model/maths_fns/n_state_model.py Tue Jan  8 17:27:35 2008
@@ -21,7 +21,7 @@
 
###############################################################################
 
 
-class N_state_model:
+class N_state_opt:
     """Class containing the target function of the optimisation of the 
N-state model."""
 
     def __init__(self):

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=4502&r1=4501&r2=4502&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  8 17:27:35 
2008
@@ -25,7 +25,7 @@
 
 # relax module imports.
 from data import Data as relax_data_store
-from maths_fns.n_state_model import N_state_model
+from maths_fns.n_state_model import N_state_opt
 from minimise.generic import generic_minimise
 from specific_fns.base_class import Common_functions
 
@@ -98,7 +98,7 @@
         """
 
         # Set up the class instance containing the target function.
-        model = N_state_model()
+        model = N_state_opt()
 
         # Setup the minimisation algorithm when constraints are present.
         if constraints and not search('^[Gg]rid', min_algor):