From ebf7bac7f1f27bdf24e95ac5143967e8bd475839 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Fri, 11 Feb 2022 10:30:24 +0100
Subject: [PATCH] Oups. 9.1.52

---
 app/comp/aux_stats.py | 17 ++++++++++-------
 sco_version.py        |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/comp/aux_stats.py b/app/comp/aux_stats.py
index 3337c2b8..3f25a5ad 100644
--- a/app/comp/aux_stats.py
+++ b/app/comp/aux_stats.py
@@ -21,14 +21,17 @@ class StatsMoyenne:
         Les valeurs NAN ou non numériques sont toujours enlevées.
         Si vals is None, renvoie des zéros (utilisé pour UE bonus)
         """
-        if vals is None or len(vals) == 0:
+        try:
+            if vals is None or len(vals) == 0 or np.isnan(vals).all():
+                self.moy = self.min = self.max = self.size = self.nb_vals = 0
+            else:
+                self.moy = np.nanmean(vals)
+                self.min = np.nanmin(vals)
+                self.max = np.nanmax(vals)
+                self.size = len(vals)
+                self.nb_vals = self.size - np.count_nonzero(np.isnan(vals))
+        except TypeError:  # que des NaN dans un array d'objets, ou ce genre de choses exotiques...
             self.moy = self.min = self.max = self.size = self.nb_vals = 0
-        else:
-            self.moy = np.nanmean(vals)
-            self.min = np.nanmin(vals)
-            self.max = np.nanmax(vals)
-            self.size = len(vals)
-            self.nb_vals = self.size - np.count_nonzero(np.isnan(vals))
 
     def to_dict(self):
         "Tous les attributs dans un dict"
diff --git a/sco_version.py b/sco_version.py
index bda50cef..a8b213f5 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.1.50"
+SCOVERSION = "9.1.52"
 
 SCONAME = "ScoDoc"