quality-measure-engine 2.5.1 → 2.5.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWIwOWQ5NDlkZjk1NjM2MDhlOWJmMzY5MzZlNjA3NGE5MjNkYTAzMg==
+  data.tar.gz: !binary |-
+    YjQ5MTUyYTZlMWJkM2ViOGQyYTQ2MDA2MmExNWE3N2FlOGFlNDNlZQ==
+SHA512:
+  metadata.gz: !binary |-
+    OTA1ODcwODdmOTM4MDJmZjdiYTkzYzc1NjFlYTZjNWViNDg4YzhlNDU3M2Nh
+    ZGJkZTQyZDQzODhjMmEzNTgzN2FlZGI3Y2U3YThiZTBlMDYxODA0YTcyNGQ4
+    M2VmN2Y5YTMzMjZlOGQwZDkzYzRkZjAyYzlkYjgxMjAwNTFjNzI=
+  data.tar.gz: !binary |-
+    NjNlMjhhOTNhYjVhNjk0ZjgxNWEyZjgzMmM4MmZlNzg3MjYyNDM5NjhmY2Nj
+    NTgzNDllMGJjN2U3MTZhZDQ5YWViZTQ3MWJhZGUyZmQ3NTZiOTgwMWExYTMx
+    NzJhOWM0OTU2YzFmZDkyM2U3YzFlNTQ3YzliY2UyMmMzOTA5ZjQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quality-measure-engine (2.5.1)
+    quality-measure-engine (2.5.2)
       delayed_job_mongoid (~> 2.0.0)
       mongoid (~> 3.1.4)
       moped (~> 1.5.1)
@@ -62,13 +62,13 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.24)
-    mini_portile (0.5.1)
+    mini_portile (0.5.2)
     minitest (4.7.5)
-    mongoid (3.1.4)
+    mongoid (3.1.5)
       activemodel (~> 3.2)
       moped (~> 1.4)
       origin (~> 1.0)
-      tzinfo (~> 0.3.22)
+      tzinfo (~> 0.3.29)
     moped (1.5.1)
     multi_json (1.7.9)
     nokogiri (1.6.0)

data/lib/qme/map/cv_aggregator.rb

@@ -6,21 +6,26 @@ module QME
       def self.median(frequencies)
         set_size = frequencies.values.reduce(0, :+)
         offset = set_size.even? ? 1 : 0
-        median_positions = [(set_size / 2), (set_size / 2)+offset]
+        left_position, right_position = [(set_size / 2), (set_size / 2) + offset]
+        current_position = -1 + offset #compensate for integer math flooring
 
-        current_position = 0
         median_left = nil
         median_right = nil
 
         frequencies.keys.sort.each do |value|
-          current_position += frequencies[value]
-          
-          median_left = value if median_left.nil? && current_position >= median_positions[0] 
-          if current_position >= median_positions[1]
-            median_right = value 
+          current_position += (frequencies[value])
+
+          if current_position >= left_position && median_left == nil
+            median_left = value
+            return median_left if set_size.odd?
+          end
+
+          if current_position >= right_position
+            median_right = value
             break
           end
         end
+
         median_left ||= 0
         median_right ||= 0
         (median_left + median_right)/2
@@ -37,4 +42,4 @@ module QME
     end
 
   end
-end
+end

data/lib/qme/version.rb

@@ -1,3 +1,3 @@
 module QME
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end

data/test/unit/qme/map/cv_aggregator_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class CVAggregatorTest < MiniTest::Unit::TestCase
+
+  def test_median_with_simple_odd_size_set
+    calc({90.0 => 1, 4315.0 => 2}, 4315.0)
+  end
+
+  def test_median_with_complex_odd_size_set
+    calc({0.0 => 5, 25.0 => 2, 50.0 => 8, 100.0 => 6}, 50.0)
+  end
+
+  def test_median_with_simple_even_size_set
+    calc({50.0 => 1, 100.0 => 1}, 75.0)
+  end
+
+  def test_median_with_large_offset_even_size_set
+    calc({1.0 => 3, 2.0 => 1, 5.0 => 1, 7.0 => 1, 8.0 => 1, 10.0 => 2, 12.0 => 1}, 6.0)
+  end
+
+  def test_median_with_complex_even_size_set
+    calc({25.0 => 5, 50.0 => 5, 100.0 => 5, 200.0 => 5}, 75.0)
+  end
+
+  def test_median_with_empty_set
+    calc({}, 0)
+  end
+
+  def test_single_element_set
+    calc({1.0 => 1}, 1.0)
+  end
+
+  def calc(ft, exp)
+    result = QME::MapReduce::CVAggregator.median(ft)
+    assert_equal exp, result
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quality-measure-engine
 version: !ruby/object:Gem::Version
-  version: 2.5.1
-  prerelease: 
+  version: 2.5.2
 platform: ruby
 authors:
 - Marc Hadley
@@ -13,12 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -26,7 +24,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,7 +31,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,7 +38,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -50,7 +45,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,7 +52,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -66,7 +59,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job_mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -74,7 +66,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -82,7 +73,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,7 +80,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -98,7 +87,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -106,7 +94,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,7 +101,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -122,7 +108,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -130,7 +115,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -138,7 +122,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,7 +129,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -154,7 +136,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -207,6 +188,7 @@ files:
 - test/test_helper.rb
 - test/unit/qme/bundle/eh_measure_sheet_test.rb
 - test/unit/qme/bundle/eh_patient_importer_test.rb
+- test/unit/qme/map/cv_aggregator_test.rb
 - test/unit/qme/map/map_reduce_builder_test.rb
 - test/unit/qme/map/map_reduce_executor_test.rb
 - test/unit/qme/map/measure_calculation_job_test.rb
@@ -214,27 +196,26 @@ files:
 - test/unit/qme/quality_report_test.rb
 homepage: http://www.projectpophealth.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This library can run JavaScript based clinical quality measures on a repository
   of patients stored in MongoDB
 test_files:
@@ -259,6 +240,7 @@ test_files:
 - test/test_helper.rb
 - test/unit/qme/bundle/eh_measure_sheet_test.rb
 - test/unit/qme/bundle/eh_patient_importer_test.rb
+- test/unit/qme/map/cv_aggregator_test.rb
 - test/unit/qme/map/map_reduce_builder_test.rb
 - test/unit/qme/map/map_reduce_executor_test.rb
 - test/unit/qme/map/measure_calculation_job_test.rb