From a348f222c0b32bbb308083bb03127fe55b1563dc Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Fri, 30 Oct 2015 08:26:04 +0000
Subject: fixed weight for multiple database hits in prediction

---
 views/batch.haml      | 12 +++++++-----
 views/prediction.haml | 10 +++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'views')

diff --git a/views/batch.haml b/views/batch.haml
index f593188..9bfa67e 100644
--- a/views/batch.haml
+++ b/views/batch.haml
@@ -33,10 +33,13 @@
               %p
               - if prediction[:confidence] == "measured"
                 %p
-                / TODO fix scientific notation from database
-                %b Measured activity:
-                = prediction[:value].numeric? ? "#{'%.2e' % prediction[:value]} (#{model.unit}) | #{'%.2e' % compound.mmol_to_mg(prediction[:value], mw)} (mg/kg_bw/day)" : prediction[:value]
-                %p Compound is part of the training dataset
+                  %b Measured activity:
+                - if prediction[:value].is_a?(Array)
+                  = prediction[:value][0].numeric? ? prediction[:value].collect{|v| weight = compound.mmol_to_mg(v, mw); '%.2e' % v + " (#{model.unit})"+" | #{'%.2e' % weight} (mg/kg_bw/day)"}.join("</br>") : prediction[:value].join(", ")
+                - else
+                  = prediction[:value].numeric? ? "#{'%.2e' % prediction[:value]} (#{model.unit}) | #{'%.2e' % compound.mmol_to_mg(prediction[:value], mw)} (mg/kg_bw/day)" : prediction[:value]
+                %p 
+                %b Compound is part of the training dataset
               - elsif prediction[:neighbors].size > 0
                 %p
                 / model type (classification|regression)
@@ -44,7 +47,6 @@
                 = model.model.class.to_s.match("Classification") ? "Classification" : "Regression"
                 %br
                 %b Prediction:
-                / TODO scientific notation
                 = prediction[:value].numeric? ? "#{'%.2e' % prediction[:value]} (#{model.unit}) | #{'%.2e' % compound.mmol_to_mg(prediction[:value], mw)} (mg/kg_bw/day)" : prediction[:value]
                 %br
                 / TODO probability
diff --git a/views/prediction.haml b/views/prediction.haml
index 11d542e..a74b95a 100644
--- a/views/prediction.haml
+++ b/views/prediction.haml
@@ -31,10 +31,14 @@
               - if prediction[:confidence] == "measured"
                 - @dbhit[i] = true
                 %p
-                / TODO fix scientific notation from database
                 %b Measured activity:
-                = (type == "Regression") ? "#{"%.2e" % prediction[:value]} (#{@models[i].unit}) | #{'%.2e' % @compound.mmol_to_mg(prediction[:value], mw)} (mg/kg_bw/day)" : prediction[:value]
-                %p Compound is part of the training dataset
+                - p prediction[:value] 
+                - if prediction[:value].is_a?(Array)
+                  = (type == "Regression") ? prediction[:value].collect{|v| weight = Compound.from_smiles(@compound.smiles).mmol_to_mg(v, mw); '%.2e' % v + " (#{@models[i].unit})"+"|#{'%.2e' % weight} (mg/kg_bw/day)"}.join("</br>") : prediction[:value].join(", ")
+                - else
+                  = (type == "Regression") ? "#{"%.2e" % prediction[:value]} (#{@models[i].unit}) | #{'%.2e' % @compound.mmol_to_mg(prediction[:value], mw)} (mg/kg_bw/day)" : prediction[:value]
+                %p 
+                  %b Compound is part of the training dataset
               - elsif prediction[:neighbors].size > 0
                 %p
                 / model type (classification|regression)
-- 
cgit v1.2.3