determinations_comparison 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a0f9ca9f006e31daea83ccdb02443074130871b
-  data.tar.gz: 68658f42da8933ba16e841168918523928d18dd6
+  metadata.gz: 79959ff2127c7711cea316f073102ea1b989b535
+  data.tar.gz: 5ef63457ad94ad279643ed0c66588f8a4fa5900a
 SHA512:
-  metadata.gz: 75bc295c243700be46a4007d4671db6a0f9f9cd47175eadb4841e064a9ecb9411b54bb2da15f7c3c2371a9a4d7dbb0006a56bd21565fbd0b3134d517db4ca874
-  data.tar.gz: 063e2c27011dc96996b4f6ea5eed4e0775eaa035f793d2885e7b22cf99e00eedee80287fc9994e150064f4f617960f961e999cb9dc3ec771c971808f746afe5e
+  metadata.gz: 8a95afd74682cc4aa92c76ec1f67ab6e4f97dd623914a744f33cd3159fd5427e4a3fbfc3247ad9adf9fa36256156fa69c39f9bd1941a2c208c636fef1a6094e0
+  data.tar.gz: 386971b6139d45c32fc2ff55a968dcea2af31f423a3182d657c7a037eb1fbf5a145942d846c84753654b772978c1fb684aafb6549499a351293ca2bba120ad7f

data/lib/determinations_comparison.rb

@@ -150,58 +150,65 @@ module DeterminationsComparison
 
       hashCategory = Hash.new
 
+      # peak picked by baseline and not undertest?
+      arr = Array.new
       @hashDiffs.each_pair do |chrom,hashChrom|
 
-        # peak picked by baseline and not undertest?
+        hash = Hash.new
+
         if hashChrom['peak_picked'] == 'by baseline but not by undertest'
-          hashCategory[:desc] = "peak picked #{hashChrom['peak_picked']}"
+          hash[:desc] = "peak picked #{hashChrom['peak_picked']}"
+          hash[:chrom] = chrom.to_s
+          hash[:per_diff] = 100  # temporarily using per_diff for a severity level
+          arr << hash
         end
 
-        break unless hashCategory.empty?
+        break unless arr.empty?
 
         if hashChrom['peak_picked'] == 'by baseline (simpsons rule) but not by undertest'
-          hashCategory[:desc] = "peak picked #{hashChrom['peak_picked']}"
+          hash[:desc] = "peak picked #{hashChrom['peak_picked']}"
+          hash[:chrom] = chrom.to_s
+          hash[:per_diff] = 50
+          arr << hash
         end
 
-        break unless hashCategory.empty?
+      end
 
-        # area within threshold?
-        per_diff = hashChrom['peak']['area'][:percent_diff]
-        threshold = hashPropertyThresholds[:area]
-        if per_diff > threshold
-          hashCategory[:desc] = 'difference in area'
-          hashCategory[:per_diff] = per_diff
-        end
+      unless arr.empty?
+        arr.sort_by! { |h| h[:per_diff] }
+        arr.first.delete(:per_diff)
+        return arr.first
+      end
 
-        break unless hashCategory.empty?
 
-        # apex time within threshold
-        per_diff = hashChrom['peak']['apex_time'][:percent_diff]
-        threshold = hashPropertyThresholds[:apex_time]
-        if per_diff > threshold
-          hashCategory[:desc] = 'difference in apex_time'
-          hashCategory[:per_diff] = per_diff
-        end
+      # area, apex_time, apex_intensity within threshold?
+      [:area,:apex_time,:apex_intensity].each do |prop|
+
+        arr = Array.new
+        @hashDiffs.each_pair do |chrom,hashChrom|
 
-        break unless hashCategory.empty?
+          hash = Hash.new
+
+          per_diff = hashChrom['peak'][prop.to_s][:percent_diff]
+          threshold = hashPropertyThresholds[prop]
+
+          if per_diff > threshold
+            hash[:desc] = "difference in #{prop.to_s}"
+            hash[:per_diff] = per_diff
+          end
 
-        # apex intensity within threshould
-        per_diff = hashChrom['peak']['apex_intensity'][:percent_diff]
-        threshold = hashPropertyThresholds[:apex_intensity]
-        if per_diff > threshold
-          hashCategory[:desc] = 'difference in apex_intensity'
-          hashCategory[:per_diff] = per_diff
         end
 
-        break unless hashCategory.empty?
+        unless arr.empty?
+          arr.sort_by! { |h| h[:per_diff] }.reverse
+          return arr.first
+        end
 
       end
 
-      if hashCategory.empty?
-        hashCategory[:desc] = 'match within thresholds'
-      end
+      hash[:desc] = 'match within thresholds'
 
-      return hashCategory
+      return hash
 
     end
 

data/lib/determinations_comparison/version.rb

@@ -1,3 +1,3 @@
 module DeterminationsComparison
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: determinations_comparison
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Shawn Hooper