Menu

SVN archive Commit Log


Commit Date  
[r25071] by tlinnet

Modified unit test regarding finding correct nested model.

This was discussed in:
http://thread.gmane.org/gmane.science.nmr.relax.devel/6684
More specific, thread:
http://thread.gmane.org/gmane.science.nmr.relax.devel/6694

2014-08-19 11:31:58 Tree
[r25070] by tlinnet

Modified the defined list of nesting, according to thread:

http://thread.gmane.org/gmane.science.nmr.relax.devel/6684

More specific, thread:
http://thread.gmane.org/gmane.science.nmr.relax.devel/6694

2014-08-19 11:31:56 Tree
[r25069] by tlinnet

Added the ordered list of nest models to the class of model information.

2014-08-19 11:31:54 Tree
[r25068] by tlinnet

Division of unit tests of specific_analyses/relax_disp/model.py into different functions.

Also added more print information to each tests.

2014-08-19 09:44:10 Tree
[r25067] by tlinnet

Moved the lookup in dictionarys for model information, into the class of model info.

2014-08-19 09:44:07 Tree
[r25066] by tlinnet

Added definition and dictionary, for each model, to determine which model they nest from.

This is better to Hard-code, since it makes it possible to produce a table with an overview,
and accurately determine which model is nested from.

This is discussed in thread.
http://thread.gmane.org/gmane.science.nmr.relax.devel/6684

2014-08-19 08:54:10 Tree
[r25065] by bugman

Small verb tense fix for the descriptions of the '* R1 fit' relaxation dispersion models.

2014-08-19 08:33:54 Tree
[r25064] by bugman

Renamed the B13 model in the manual to BK13 as the authors are Baldwin and Kay.

This is the Baldwin and Kay 2013 relaxation dispersion model for off-resonance R1rho data that is
not implemented in relax yet.

2014-08-19 07:53:05 Tree
[r25063] by tlinnet

Moved the nesting lists down in variables file.

2014-08-19 07:42:43 Tree
[r25062] by tlinnet

Reverted r25061 and 425060 as this functionality should be re-written.

The command used was:
svn merge -r25061:r25059 .

........
r25061 | tlinnet | 2014-08-18 19:39:27 +0200 (Mon, 18 Aug 2014) | 1 line

Removed that any off-resonance R1rho models will learn 'dw' from DPL94.
........
r25060 | tlinnet | 2014-08-18 19:37:26 +0200 (Mon, 18 Aug 2014) | 25 lines

Removed special cases for nesting.

Now following order is determined.

Firs sort completed models into:
EQ_NUMERIC, EQ_SILICO, EQ_ANALYTIC

Then into year, with newest first.
Then number of chemical sites, which reflects number of parameters.

Go through the completed models.

If the experiment types are the same.
Then look for:

If a completed model has same parameters, then nest from this.
If a completed model has all other parameters than R20 parameters, then nest from this.

Special cases are taken care of by:
- MODEL_LM63_3SITE from MODEL_LM63
- MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR from MODEL_NS_MMQ_2SITE.
- MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR from MODEL_NS_R1RHO_2SITE.
- MODEL_MMQ_CR72 from MODEL_CR72.

This functionality represents the hard-coding from previous implementation.
........

2014-08-19 07:39:58 Tree
Older >
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.