Author: bugman
Date: Thu May 22 18:03:57 2008
New Revision: 6263
URL: http://svn.gna.org/viewcvs/relax?rev=6263&view=rev
Log:
Shifted all last dependencies from the 'minimise' relax package to the
'minfx' python package.
Modified:
1.3/prompt/minimisation.py
1.3/specific_fns/model_free/model_free.py
1.3/specific_fns/relax_fit.py
Modified: 1.3/prompt/minimisation.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/prompt/minimisation.py?rev=6263&r1=6262&r2=6263&view=diff
==============================================================================
--- 1.3/prompt/minimisation.py (original)
+++ 1.3/prompt/minimisation.py Thu May 22 18:03:57 2008
@@ -25,7 +25,7 @@
import sys
# relax module imports.
-from minimise.generic import generic_minimise
+from minfx.generic import generic_minimise
from generic_fns import minimise
from relax_errors import RelaxBoolError, RelaxError, RelaxIntError,
RelaxIntListIntError, RelaxListError, RelaxListNumError, RelaxNoneError,
RelaxNoneNumError, RelaxNumError, RelaxStrError
@@ -159,13 +159,13 @@
~~~~~~~~~
The arguments, which should all be strings, specify the minimiser as
well as its options. A
- minimum of one argument is required. As this calls the function
'generic_minimise' the full
- list of allowed arguments is shown below in the reproduced
'generic_minimise' docstring.
- Ignore all sections except those labelled as minimisation algorithms
and minimisation
- options. Also do not select the Method of Multipliers constraint
algorithm as this is used
- in combination with the given minimisation algorithm if the keyword
argument 'constraints'
- is set to 1. The grid search algorithm should also not be selected
as this is accessed
- using the 'grid' function instead. The first argument passed will
be set to the
+ minimum of one argument is required. As this calls the minfx
function 'generic_minimise'
+ the full list of allowed arguments is shown below in the reproduced
'generic_minimise'
+ docstring. Ignore all sections except those labelled as
minimisation algorithms and
+ minimisation options. Also do not select the Method of Multipliers
constraint algorithm as
+ this is used in combination with the given minimisation algorithm if
the keyword argument
+ 'constraints' is set to 1. The grid search algorithm should also
not be selected as this is
+ accessed using the 'grid' function instead. The first argument
passed will be set to the
minimisation algorithm while all other arguments will be set to the
minimisation options.
Keyword arguments differ from normal arguments having the form
'keyword = value'. All
@@ -243,9 +243,10 @@
--------------------------------------------------------------------------------------------
All the text which follows is a reproduction of the docstring of the
generic_minimise
- function. Only take note of the minimisation algorithms and
minimisation options sections,
- the other sections are not relevant for this function. The Grid
search and Method of
- Multipliers algorithms CANNOT be selected as minimisation algorithms
for this function.
+ function from the minfx python package. Only take note of the
minimisation algorithms and
+ minimisation options sections, the other sections are not relevant
for this function. The
+ Grid search and Method of Multipliers algorithms CANNOT be selected
as minimisation
+ algorithms for this function.
The section entitled Keyword Arguments is also completely
inaccessible therefore please
ignore that text.
Modified: 1.3/specific_fns/model_free/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/model_free.py?rev=6263&r1=6262&r2=6263&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/model_free.py (original)
+++ 1.3/specific_fns/model_free/model_free.py Thu May 22 18:03:57 2008
@@ -35,7 +35,7 @@
from generic_fns import diffusion_tensor
from generic_fns.mol_res_spin import count_spins, exists_mol_res_spin_data,
return_spin, return_spin_from_index, spin_loop
from maths_fns.mf import Mf
-from minimise.generic import generic_minimise
+from minfx.generic import generic_minimise
from physical_constants import N15_CSA, NH_BOND_LENGTH
from relax_errors import RelaxError, RelaxFuncSetupError, RelaxInfError,
RelaxInvalidDataError, RelaxLenError, RelaxNaNError, RelaxNoModelError,
RelaxNoPdbError, RelaxNoResError, RelaxNoPipeError, RelaxNoSequenceError,
RelaxNoTensorError, RelaxNoValueError, RelaxNoVectorsError,
RelaxNucleusError, RelaxTensorError
import specific_fns
Modified: 1.3/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=6263&r1=6262&r2=6263&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Thu May 22 18:03:57 2008
@@ -35,7 +35,7 @@
from base_class import Common_functions
from generic_fns import intensity
from generic_fns.mol_res_spin import count_spins, exists_mol_res_spin_data,
generate_spin_id, return_spin_from_index, spin_loop
-from minimise.generic import generic_minimise
+from minfx.generic import generic_minimise
from relax_errors import RelaxError, RelaxFuncSetupError, RelaxLenError,
RelaxNoModelError, RelaxNoPipeError, RelaxNoSequenceError
# C modules.
r6263 - in /1.3: prompt/minimisation.py specific_fns/model_free/model_free.py specific_fns/relax_fit.py