From 7edd0511835ca58d8bcb551541632808ac56b38a Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Tue, 1 Mar 2022 09:34:05 +0100
Subject: [PATCH] Fix: bonus St Quentin / Ville d'Avray

---
 app/comp/bonus_spo.py | 17 +++++++++++------
 sco_version.py        |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/comp/bonus_spo.py b/app/comp/bonus_spo.py
index 99738336ee..cb3d93e4f1 100644
--- a/app/comp/bonus_spo.py
+++ b/app/comp/bonus_spo.py
@@ -338,9 +338,12 @@ class BonusAisneStQuentin(BonusSportAdditif):
             # pas d'étudiants ou pas d'UE ou pas de module...
             return
         # Calcule moyenne pondérée des notes de sport:
-        bonus_moy_arr = np.sum(
-            sem_modimpl_moys_inscrits * modimpl_coefs_etuds_no_nan, axis=1
-        ) / np.sum(modimpl_coefs_etuds_no_nan, axis=1)
+        with np.errstate(invalid="ignore"):  # ignore les 0/0 (-> NaN)
+            bonus_moy_arr = np.sum(
+                sem_modimpl_moys_inscrits * modimpl_coefs_etuds_no_nan, axis=1
+            ) / np.sum(modimpl_coefs_etuds_no_nan, axis=1)
+        np.nan_to_num(bonus_moy_arr, nan=0.0, copy=False)
+
         bonus_moy_arr[bonus_moy_arr < 10.0] = 0.0
         bonus_moy_arr[bonus_moy_arr >= 18.1] = 0.5
         bonus_moy_arr[bonus_moy_arr >= 16.1] = 0.4
@@ -823,9 +826,11 @@ class BonusVilleAvray(BonusSport):
             # pas d'étudiants ou pas d'UE ou pas de module...
             return
         # Calcule moyenne pondérée des notes de sport:
-        bonus_moy_arr = np.sum(
-            sem_modimpl_moys_inscrits * modimpl_coefs_etuds_no_nan, axis=1
-        ) / np.sum(modimpl_coefs_etuds_no_nan, axis=1)
+        with np.errstate(invalid="ignore"):  # ignore les 0/0 (-> NaN)
+            bonus_moy_arr = np.sum(
+                sem_modimpl_moys_inscrits * modimpl_coefs_etuds_no_nan, axis=1
+            ) / np.sum(modimpl_coefs_etuds_no_nan, axis=1)
+        np.nan_to_num(bonus_moy_arr, nan=0.0, copy=False)
         bonus_moy_arr[bonus_moy_arr < 10.0] = 0.0
         bonus_moy_arr[bonus_moy_arr >= 16.0] = 0.3
         bonus_moy_arr[bonus_moy_arr >= 12.0] = 0.2
diff --git a/sco_version.py b/sco_version.py
index b47a266d71..fbbf5bc82f 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.1.66"
+SCOVERSION = "9.1.67"
 
 SCONAME = "ScoDoc"