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.
........
