Merge pull request #138 from teharrison/master

fixed bug with negative values in predicted rna features
MG-RAST · Apr 8, 2013 · ece686e · ece686e
2 parents 93ba187 + 4151b2d
commit ece686e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/widgets/widget.collection_overview.js b/widgets/widget.collection_overview.js
@@ -305,6 +305,10 @@
         var ann_aa_reads  = (ann_reads && (ann_reads > ann_rna_reads)) ? ann_reads - ann_rna_reads : 0;
         var unkn_aa_reads = aa_reads - ann_aa_reads;
         var unknown_all   = raw_seqs - (qc_fail_seqs + unkn_aa_reads + ann_aa_reads + ann_rna_reads);
+        if (raw_seqs < (qc_fail_seqs + ann_rna_reads)) {
+            var diff = (qc_fail_seqs + ann_rna_reads) - raw_seqs;
+            unknown_all = (diff > unknown_all) ? 0 : unknown_all - diff;
+        }
         // fuzzy math
         if (is_rna) {
             qc_fail_seqs  = raw_seqs - qc_rna_seqs;

diff --git a/widgets/widget.metagenome_overview.js b/widgets/widget.metagenome_overview.js
@@ -378,6 +378,10 @@
         var ann_aa_reads  = (ann_reads && (ann_reads > ann_rna_reads)) ? ann_reads - ann_rna_reads : 0;
         var unkn_aa_reads = aa_reads - ann_aa_reads;
         var unknown_all   = raw_seqs - (qc_fail_seqs + unkn_aa_reads + ann_aa_reads + ann_rna_reads);
+        if (raw_seqs < (qc_fail_seqs + ann_rna_reads)) {
+            var diff = (qc_fail_seqs + ann_rna_reads) - raw_seqs;
+            unknown_all = (diff > unknown_all) ? 0 : unknown_all - diff;
+        }
         // fuzzy math
         if (is_rna) {
             qc_fail_seqs  = raw_seqs - qc_rna_seqs;