Author: tlinnet
Date: Mon Aug 18 18:35:34 2014
New Revision: 25056
URL: http://svn.gna.org/viewcvs/relax?rev=25056&view=rev
Log:
Reverted r25054 and 25055 as this functionality is not properly determined
yet.
The command used was:
svn merge -r25055:r25053 .
........
r25055 | tlinnet | 2014-08-18 17:59:16 +0200 (Mon, 18 Aug 2014) | 3 lines
Fix for unit test, testing how models are sorted before analysis.
This now resembles the previous state.
........
r25054 | tlinnet | 2014-08-18 17:59:14 +0200 (Mon, 18 Aug 2014) | 8 lines
Modified, that the order of sorting models for auto_analysis, should be:
Analytical first, then silico, and then numeric.
After this, the year for implementation should come first.
This makes sure that CR72 is analysed first.
And also DPL94 will be sorted first.
........
Modified:
trunk/specific_analyses/relax_disp/model.py
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py
Modified: trunk/specific_analyses/relax_disp/model.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/model.py?rev=25056&r1=25055&r2=25056&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/model.py (original)
+++ trunk/specific_analyses/relax_disp/model.py Mon Aug 18 18:35:34 2014
@@ -78,7 +78,7 @@
self.eq_i = order_eq.index(self.eq)
# Define the order of how equation type ranks, when sorting before
auto analyses.
- order_s = [EQ_ANALYTIC, EQ_SILICO, EQ_NUMERIC]
+ order_s = [EQ_SILICO, EQ_ANALYTIC, EQ_NUMERIC]
# Save the index of current model to order of equation type.
self.eq_s = order_s.index(self.eq)
@@ -297,7 +297,7 @@
all_models_info = models_info(models)
# Sort the models according to: exp_type, equation type, chemical sites,
year for model, number of parameters.
- all_models_info_sorted = sorted(all_models_info,
key=attrgetter('exp_type_i', 'eq_s', 'sites', 'year', 'params_nr'))
+ all_models_info_sorted = sorted(all_models_info,
key=attrgetter('exp_type_i', 'eq_s', 'sites', 'year_diff', 'params_nr'))
# Define list of sorted models.
sorted_models = []
Modified:
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py?rev=25056&r1=25055&r2=25056&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py
(original)
+++ trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py
Mon Aug 18 18:35:34 2014
@@ -251,7 +251,7 @@
## Test sort of models, when models are all R1rho models with fitted
R1.
# Define all the models tested in the analysis.
self_models = [MODEL_R2EFF, MODEL_NOREX_R1RHO_FIT_R1,
MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1,
MODEL_NS_R1RHO_2SITE_FIT_R1]
- expected_result = [MODEL_R2EFF, MODEL_NOREX_R1RHO_FIT_R1,
MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1,
MODEL_NS_R1RHO_2SITE_FIT_R1]
+ expected_result = [MODEL_R2EFF, MODEL_NOREX_R1RHO_FIT_R1,
MODEL_MP05_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_TP02_FIT_R1, MODEL_DPL94_FIT_R1,
MODEL_NS_R1RHO_2SITE_FIT_R1]
# Test the return.
self.assertEqual(sort_models(models=self_models), expected_result)
@@ -259,7 +259,7 @@
## Test sort of models, when models are all CPMG models.
# Define all the models tested in the analysis.
self_models = [MODEL_R2EFF, MODEL_NOREX, MODEL_CR72,
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_B14_FULL,
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_3D,
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR,
MODEL_NS_CPMG_2SITE_STAR_FULL]
- expected_result = [MODEL_R2EFF, MODEL_NOREX, MODEL_CR72,
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_B14_FULL,
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_3D,
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_3D_FULL,
MODEL_NS_CPMG_2SITE_STAR_FULL]
+ expected_result = [MODEL_R2EFF, MODEL_NOREX,
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_B14, MODEL_B14_FULL, MODEL_TSMFK01,
MODEL_IT99, MODEL_CR72, MODEL_CR72_FULL, MODEL_NS_CPMG_2SITE_3D,
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_3D_FULL,
MODEL_NS_CPMG_2SITE_STAR_FULL]
# Test the return.
self.assertEqual(sort_models(models=self_models), expected_result)
@@ -275,7 +275,7 @@
## Test sort of models, when models are mix of CPMG and CPMG MMQ
models.
# Define all the models tested in the analysis.
self_models = [MODEL_R2EFF, MODEL_NOREX, MODEL_NS_MMQ_3SITE,
MODEL_NS_MMQ_2SITE, MODEL_MMQ_CR72, MODEL_CR72, MODEL_B14,
MODEL_NS_MMQ_3SITE_LINEAR]
- expected_result = [MODEL_R2EFF, MODEL_NOREX, MODEL_CR72, MODEL_B14,
MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE_LINEAR,
MODEL_NS_MMQ_3SITE]
+ expected_result = [MODEL_R2EFF, MODEL_NOREX, MODEL_B14, MODEL_CR72,
MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE_LINEAR,
MODEL_NS_MMQ_3SITE]
## Test the return.
self.assertEqual(sort_models(models=self_models), expected_result)
r25056 - in /trunk: specific_analyses/relax_disp/model.py test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py