relax SVN archive

Reverted r25024, related to Linear Constraints change.

The command used was:
svn merge -r25024:r25023 .

........
r25024 | tlinnet | 2014-08-15 15:11:00 +0200 (Fri, 15 Aug 2014) | 11 lines

Modified the Linear Constraints for the exchange rates.

For CPMG, the maximum kex should be 10^4, and for R1rho it should be 10^5.
This is altered from the value of 10^6.

The suggested restraints for 'kex' follows from article, on page 224:

Nuclear Magnetic Resonance Methods for Quantifying Microsecond-to-Millisecond Motions in Biological Macromolecules.
Palmer-III, Arthur G., Kroenke, Christopher D., Loria, J. Patrick
Nucl. Magn. Reson. Biol. Macromol. B, 2001, Vol: 339, pages 204-238.
U{DOI: 10.1016/S0076-6879(01)39315-1<http://dx.doi.org/10.1016/S0076-6879%2801%2939315-1>}
........

Fix for parameter conversion for:

MODEL_PARAMS_NS_MMQ_3SITE
and
MODEL_PARAMS_NS_MMQ_3SITE_LINEAR

Fix for parameter conversion when model is:
MODEL_PARAMS_NS_R1RHO_3SITE or MODEL_PARAMS_NS_R1RHO_3SITE_LINEAR.

Modified systemtest Relax_disp.test_model_nesting_and_param() to only print, when the
converted parameter is different from the original parameter.

Inserted systemtest Relax_disp.test_model_nesting_and_param() which will
go through all models, and then through all it nested models, testing that all parameters have a conversion.

Implemented the nesting of parameters from a model with fewer chemical sites when nesting for NS R1rho 3sites.

Implemented the special flag '1 - pA', when nesting parameters from models with fewer chemical sites.

Modified to unit test, that when model:
MODEL_PARAMS_NS_R1RHO_3SITE

nest from:
MODEL_PARAMS_NS_R1RHO_2SITE

the conversion should be:
'r2', 'r2'
'pA', 'pA'
'dw_AB', 'dw'
'kex_AB', 'kex'
'pB', '1 - pA'
'dw_BC', 'dw'
'kex_BC', 'kex'
'kex_AC', 'kex'

Here '1 - pA' is a special conversion flag.

Fix to unit test, after MODEL_NS_CPMG_2SITE_EXPANDED has been preferred over other numerical CPMG models.

Modified the nesting for 'NS MMQ 3-site linear'.

'NS MMQ 3-site linear' should be able to nest from 'NS MMQ 3-site'.