Merge pull request #1886 from projectcypress/master

Merge 7/29
projectcypress · Jul 29, 2024 · 16becaa · 16becaa
2 parents e2fa329 + 4c9a747
commit 16becaa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -456,8 +456,8 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.2)
+      strscan
     roar (1.1.1)
       representable (~> 3.0)
     roar-rails (1.1.0)

diff --git a/contrib/upgrade_cypress_70.sh b/contrib/upgrade_cypress_70.sh
@@ -26,12 +26,12 @@ apt-get update
 if [ $(dpkg-query -W -f='${Status}' cypress 2>/dev/null | grep -c "ok installed") -eq 1 ];
 then
   printf "${GREEN}---> Attempting to upgrade Cypress...${NC}\n"
-  apt-get -y --allow-change-held-packages install cypress cqm-execution-service cqm-execution-service-55
+  apt-get -y --allow-change-held-packages install cypress cqm-execution-service
   cypress run rake db:migrate
-  systemctl restart cypress cqm-execution-service cqm-execution-service-55
+  systemctl restart cypress cqm-execution-service
   cypress run rake tmp:cache:clear
   cypress run rake db:migrate
-  systemctl restart cypress cqm-execution-service cqm-execution-service-55
+  systemctl restart cypress cqm-execution-service
   cypress run rake tmp:cache:clear
 else
   printf "${RED}---> Cypress not found, continuing...${NC}\n"

diff --git a/lib/cypress/expected_results_calculator.rb b/lib/cypress/expected_results_calculator.rb
@@ -118,10 +118,10 @@ def calculate_observation(observation_hash, measure, population_set_key)
           @measure_result_hash[measure.hqmf_id][key]['observations'][population] = { method: 'MEDIAN', hqmf_id: observation.hqmf_id,
                                                                                      value: median_value }
         when 'SUM'
-          @measure_result_hash[measure.hqmf_id][key]['observations'][population] = { value: sum(observation_map[:values].map(&:value)),
+          @measure_result_hash[measure.hqmf_id][key]['observations'][population] = { value: sum(observation_map[:values].map(&:value).compact),
                                                                                      method: 'SUM', hqmf_id: observation.hqmf_id }
         when 'AVERAGE'
-          @measure_result_hash[measure.hqmf_id][key]['observations'][population] = { value: mean(observation_map[:values].map(&:value)),
+          @measure_result_hash[measure.hqmf_id][key]['observations'][population] = { value: mean(observation_map[:values].map(&:value).compact),
                                                                                      method: 'AVERAGE', hqmf_id: observation.hqmf_id }
         end
       end