diff options
| author | mr <mr@mrautenberg.de> | 2011-08-04 16:38:23 +0200 |
|---|---|---|
| committer | mr <mr@mrautenberg.de> | 2011-08-04 16:38:23 +0200 |
| commit | 8acc69ba7209bed93337ad34b347629731f79468 (patch) | |
| tree | 384c178651e65a55c7139075e7f8ec0eb851e4b7 | |
| parent | b36d2744eb273fa7df752b0d305cd257dd3e78b8 (diff) | |
| parent | 8b63e71e9cb0c6b377e83f793370039410012ed4 (diff) | |
Merge remote branch 'origin/development' into release/v2.1.0
| -rw-r--r-- | views/feature_table.haml | 4 | ||||
| -rw-r--r-- | views/lazar_algorithm.haml | 20 |
2 files changed, 15 insertions, 9 deletions
diff --git a/views/feature_table.haml b/views/feature_table.haml index e75c818..7c57331 100644 --- a/views/feature_table.haml +++ b/views/feature_table.haml @@ -6,7 +6,7 @@ activating - else predominatly in compounds with activity - = "\"#{@value_map[2]}\"" + = "\"#{@value_map[@value_map.keys.sort.last]}\"" ( %a{:href => "http://www.daylight.com/dayhtml/doc/theory/theory.smarts.html", :rel => "external"} SMARTS ) @@ -23,7 +23,7 @@ deactivating - else predominatly in compounds with activity - = "\"#{@value_map[1]}\"" + = "\"#{@value_map[@value_map.keys.sort.first]}\"" ( %a{:href => "http://www.daylight.com/dayhtml/doc/theory/theory.smarts.html", :rel => "external"} SMARTS ) diff --git a/views/lazar_algorithm.haml b/views/lazar_algorithm.haml index e5b70f6..76a993b 100644 --- a/views/lazar_algorithm.haml +++ b/views/lazar_algorithm.haml @@ -32,23 +32,29 @@ %p = toggle_link "#significant_fragments", "Significant fragments" are highlighted in the structure display as follows: - %ul - - if @value_map.empty? + - if @value_map.empty? + %ul %li .active activating fragments %li .inactive deactivating fragments %li .inconclusive regions, where activating and deactivating fragments overlap - - else %li - .active= "features that occur predominately in compounds with activity: \"#{@value_map[2]}\"" + .other inert parts + - else + %ul + %li + .active= "features that occur predominately in compounds with activity: \"#{@value_map[@value_map.keys.sort.last]}\"" %li - .inactive= "features that occur predominately in compounds with activity: \"#{@value_map[1]}\"" + .inactive= "features that occur predominately in compounds with activity: \"#{@value_map[@value_map.keys.sort.first]}\"" %li .inconclusive regions, where fragments from different classes overlap - %li - .other inert parts + %li + .other inert parts + - if @value_map.size > 2 + .notice Incomplete implementation of feature highlighting and display of significant fragments. Only features for 2 classes are shown! + %p Please keep in mind that predictions are based on the measured activities of neighbors. |