ajout de cas d'erreur dans les calculs d'indicateurs

Léonard Michelet · leonarf · commit b214774f47d0 · 2022-04-07T12:18:06.000+02:00
diff --git a/enthic/app.py b/enthic/app.py
@@ -22,6 +22,7 @@
     INFO_TRAITEMENT,
     ONTOLOGY,
     SCORE_DESCRIPTION,
+    SCORE_ERROR,
 )
 from enthic.scoring.main import compute_score, get_percentiles, save_score_in_database
 from enthic.utils.ape_utils import (
@@ -130,6 +131,17 @@ def scores():
     return OKJSONResponse(SCORE_DESCRIPTION)
 
 
+@application.route("/ontology/error_code", methods=["GET"], strict_slashes=False)
+@application.route("/ontology/error_codes", methods=["GET"], strict_slashes=False)
+def error_codes():
+    """
+    Return description of all scores computed.
+
+       :return: HTTP Response as application/json. the ontology as JSON.
+    """
+    return OKJSONResponse(SCORE_ERROR)
+
+
 @application.route("/ontology/metadata", methods=["GET"], strict_slashes=False)
 def metadata():
     """
diff --git a/enthic/compute_indicators.py b/enthic/compute_indicators.py
@@ -13,7 +13,7 @@ def compute_companies_statistics(host, year, limit, offset):
         :param host: API address IP + port
     """
     indicators_count = 0
-    for i in range(offset, 2000000, limit):
+    for i in range(offset, 2500000, limit):
         url = "http://" + host + "/compute/company/all/" + str(i) + "/" + str(limit)
         if year:
             url += "/" + str(year)
diff --git a/enthic/ontology.py b/enthic/ontology.py
@@ -3164,10 +3164,13 @@ def read_account():
     -1100: "Montant des salaires non fournis",
     -1200: "Montant des salaires à zéro",
     -1300: "Montant des salaires négatif",
+    -1400: "Montant des salaires supérieurs aux charges",
     -2000: "Montant des cotisations sociales incohérent",
     -2100: "Montant des cotisations sociales non fournis",
     -2200: "Montant des cotisations sociales à zéro",
     -2300: "Montant des cotisations sociales négatif",
+    -2400: "Montant des cotisations sociales supérieurs aux salaires",
+    -2500: "Montant des cotisations sociales supérieurs aux charges",
     -3100: "Montant des impôts sur les bénéfices non fournis",
     -3200: "Montant des impôts sur les bénéfices négatif",
     -4100: "Effectifs non fournis",
@@ -3177,4 +3180,11 @@ def read_account():
     -6100: "Montant des charges d’exploitation non fournis",
     -6200: "Montant des charges d’exploitation à zéro",
     -6300: "Montant des charges d’exploitation négatif",
+    -6400: "Montant des charges d’exploitation incohérent",
+    -7100: "Montant du résultat d'exploitation non fournis",
+    -7200: "Montant du résultat d'exploitation négatif",
+    -8000: "Montant du résultat financier ou exceptionnel non négligeable",
+    -9000: "Montant des resultats négatif ou nul",
+    -10000: "Montant de la participation négatif",
+    -9999: "Numérateur ou dénominateur incohérent",
 }
diff --git a/enthic/scoring/compute_stats.py b/enthic/scoring/compute_stats.py
@@ -119,10 +119,43 @@ def check_tree_data(tree_item):
                     child_data["status"] = "computed"
                     if "computedValue" in child_data:
                         child_data["value"] = child_data["computedValue"]
+                        for child_child_name in tree_item["children"][child_name][
+                            "children"
+                        ]:
+                            set_to_zero_computed(
+                                tree_item["children"][child_name]["children"][
+                                    child_child_name
+                                ]
+                            )
                     else:
                         child_data["value"] = 0
 
             computed_sum = computed_sum_from_computed
+
+        # If official value match computed value * 1000, it mean value was multiplied by 1000 by mistake
+        elif (
+            abs((computed_sum * 1000 - value) / value) < relative_error
+            or abs(computed_sum * 1000 - value) < absolute_error
+        ):
+            tree_item["data"]["status"] = "scaled down"
+            tree_item["data"]["value"] = computed_sum
+            # Fix children values if needed
+            if child_missing_count > 0:
+                for child_name in tree_item["children"]:
+                    set_to_zero_computed(tree_item["children"][child_name])
+
+        # If official value match computed value / 1000, it mean value was divided by 1000 by mistake
+        elif (
+            abs((computed_sum - value * 1000) / value) < relative_error
+            or abs(computed_sum - value * 1000) < absolute_error
+        ):
+            tree_item["data"]["status"] = "scaled up"
+            tree_item["data"]["value"] = computed_sum
+            # Fix children values if needed
+            if child_missing_count > 0:
+                for child_name in tree_item["children"]:
+                    set_to_zero_computed(tree_item["children"][child_name])
+
         # If there is only one value missing from children, set this child's value equal to the computed difference
         elif child_missing_count == 1:
             for child_name in tree_item["children"]:
diff --git a/enthic/scoring/scoring_functions.py b/enthic/scoring/scoring_functions.py
@@ -12,26 +12,44 @@ def compute_exploitation_share(data):
     participation = data["participation"]
     impot = data["impot"]
     resultat_exploitation = data["resultat_exploitation"]
+    benefice_attribue = data["benefice_attribue"]
 
     # If any values unknown, cannot compute score
     if isnan(impot):
         return -3100
     if impot < 0:
         return -3200
-    if (
-        any(isnan(value) for value in [resultat_exploitation])
-        or resultat_exploitation < 0
-    ):
-        return float("nan")
+    if isnan(resultat_exploitation):
+        return -7100
+    if isnan(benefice_attribue):
+        benefice_attribue = 0
+    if resultat_exploitation + benefice_attribue <= 0:
+        return -7200
 
     if isnan(participation):
         participation = 0
     # Compute score if possible
     shared_part = participation + impot
-    if resultat_exploitation > 0:
-        return shared_part / resultat_exploitation
 
-    return float("nan")
+    total_resultat = resultat_exploitation + benefice_attribue
+    result = shared_part / total_resultat
+
+    if result < 0 and participation < 0:
+        return -10000
+
+    if result > 10:
+        resultat_exceptionnel = data["resultat_exceptionnel"]
+        resultat_financier = data["resultat_financier"]
+        if isnan(resultat_financier):
+            resultat_financier = 0
+        if isnan(resultat_exceptionnel):
+            resultat_exceptionnel = 0
+        if resultat_exceptionnel + resultat_financier > total_resultat:
+            return -8000
+    if result > 1000:
+        return -9999
+
+    return result
 
 
 def compute_overall_wages_weight(data):
@@ -59,8 +77,22 @@ def compute_overall_wages_weight(data):
 
     result = (salaires + cotisations_sociales) / charges
 
-    if result < 0 and charges < 0:
-        return -6300
+    if result < 0:
+        if charges < 0:
+            return -6300
+        elif cotisations_sociales < 0:
+            return -2300
+        elif salaires < 0:
+            return -1300
+
+    if result > 2:
+        if cotisations_sociales > charges and salaires > charges:
+            return -6400
+        elif cotisations_sociales > charges:
+            return -2500
+        elif salaires > charges:
+            return -1400
+        return -9999
 
     return result
 
@@ -96,6 +128,8 @@ def compute_wage_quality(data):
             return -1300
         if cotisations_sociales < 0:
             return -2300
+    if ratio > 2:
+        return -2400
     return ratio
 
 
@@ -151,16 +185,25 @@ def compute_profit_sharing(data):
     ):
         return float("nan")
 
-    somme_resultats = resultat_financier + resultat_exploitation + resultat_exceptionnel
-    if somme_resultats == 0:
-        return float("nan")
+    if isnan(benefice_attribue):
+        benefice_attribue = 0
+    somme_resultats = (
+        resultat_financier
+        + resultat_exploitation
+        + resultat_exceptionnel
+        + benefice_attribue
+    )
+
+    if somme_resultats <= 0:
+        return -9000
 
     if isnan(participation):
         participation = 0
 
     result = (participation + impot) / somme_resultats
-    if result < 0 and not isnan(benefice_attribue) and benefice_attribue > 0:
-        return -5100
+
+    if result < 0 and participation < 0:
+        return -10000
 
     return result
 
@@ -196,17 +239,17 @@ def compute_exploitation_part(data):
     ) == 0:
         return float("nan")
 
-    result = (data["produits_exploitation"] + data["charges_exploitation"]) / (
-        data["produits_exploitation"]
-        + data["charges_exploitation"]
-        + data["produits_exceptionnel"]
-        + data["charges_exceptionnel"]
-        + data["produits_financier"]
-        + data["charges_financier"]
+    result = (
+        abs(data["produits_exploitation"]) + abs(data["charges_exploitation"])
+    ) / (
+        abs(data["produits_exploitation"])
+        + abs(data["charges_exploitation"])
+        + abs(data["produits_exceptionnel"])
+        + abs(data["charges_exceptionnel"])
+        + abs(data["produits_financier"])
+        + abs(data["charges_financier"])
     )
-    if result < 0:
-        if data["charges_exploitation"] < 0:
-            return -6300
+
     return result
 
 
@@ -224,3 +267,6 @@ def compute_data_availability(data):
             data_available += 1
 
     return data_available / len(data)
+
+
+# SELECT * FROM `annual_statistics` where stats_type != 4 and value not in (-4300, -6300, -6100, -6200, -5100, -1000, -1100, -1200, -1300, -2000, -2100, -2200, -2300, -2400, -2500, -3100, -3200, -4100, -4200, -4300, -1400, -6400, -7100, -7200, -8000, -9000, -9999, -10000) ORDER BY `annual_statistics`.`value`  ASC;
