diff --git a/Data b/Data index a960674..f10fc4d 160000 --- a/Data +++ b/Data @@ -1 +1 @@ -Subproject commit a9606748a64885b7ae2e7995e26a53ae9595fe63 +Subproject commit f10fc4d4d141dbff3c92ddd5ebfcfd7a48f9765b diff --git a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_histo.pdf b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_histo.pdf index b5dba0f..e8c7f5b 100644 Binary files a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_histo.pdf and b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_histo.pdf differ diff --git a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_rose.pdf b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_rose.pdf index 9ac6d2a..1c5171a 100644 Binary files a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_rose.pdf and b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_rose.pdf differ diff --git a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_stats.csv b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_stats.csv index b01d707..e60b424 100644 --- a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_stats.csv +++ b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_stats.csv @@ -4,8 +4,8 @@ * Version : 2026.01.09 * * Fichier source : ~\Synthese-PSM_LARRA\Outputs\database_Synthese-PSM_LARRA.sql * * Dossier destination : ~\Synthese-PSM_LARRA\Outputs\stat_database_Synthese-PSM_LARRA_2026-01-08 * -* Date : 2026-01-08 22:56:57 * -* Durée calcul: 02(m)23(s) sans erreur * +* Date : 2026-01-08 23:45:03 * +* Durée calcul: 02(m)28(s) sans erreur * ************************************************************************************************************************* **Développement total centerline:** 340754.54 13027.78 10574.75 - - Dev.(m), Dupl.(m), Surf.(m) Attention, 82 station(s) non comptabilisée(s) et raccordée(s) diff --git a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_stats.md b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_stats.md index b65158b..db0c27e 100644 --- a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_stats.md +++ b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_stats.md @@ -1,17 +1,19 @@ -------------- -- **Script :** * Calcul des statistiques par entrées d'une BD Therion -- **Version :** `* Script pythStat par alexandre.pont@yahoo.fr` -- **Fichier source :** `* Version : 2026.01.09` -- **Dossier destination :** `* Fichier source : ~\Synthese-PSM_LARRA\Outputs\database_Synthese-PSM_LARRA.sql` -- **Date :** `* Dossier destination : ~\Synthese-PSM_LARRA\Outputs\stat_database_Synthese-PSM_LARRA_2026-01-08` -- **Durée du calcul :** `* Date : 2026-01-08 22:56:57` -- **Durée calcul : ** `02(m)23(s) sans erreur ` -**Développement total des centerlines (m):** **, Développement:** 340754.54 **, Dupliqué:** 13027.78 **, Surface:** 10574.75 +# Calcul des statistiques par entrées d'une BD Therion +- ** Script pythStat par alexandre.pont@yahoo.fr** +- ** Version : 2026.01.09** +- ** Fichier source : ~\Synthese-PSM_LARRA\Outputs\database_Synthese-PSM_LARRA.sql** +- ** Dossier destination : ~\Synthese-PSM_LARRA\Outputs\stat_database_Synthese-PSM_LARRA_2026-01-08** +- ** Date : 2026-01-08 23:45:03** +- ** Durée calcul : 02(m)28(s) sans erreur** +-------------- +**Développement total des centerlines (m):** , Développement: '340754.54', Dupliqué: '13027.78', Surface: '10574.75' !!Attention, 82 station(s) non comptabilisée(s) et raccordée(s) -------------- **Développement total par réseaux** -| Entrée(s) | Nbre | Dev.(m) | Prof.(m) | Dupl.(m) | Surf.(m) | Visées | ID Sta. | Alt. min(m) | ID Sta. | Alt. max(m) | +| Entrée(s) | Nbre | Dev.(m) | Prof.(m) | Dupl.(m) | Surf.(m) | Visées | ID Sta. | Alt. min(m) | ID Sta. | Alt. max(m) | +|------|------|------|------|------|------|------|------|------|------|------| | Totaux (entrées et points fixes) | 193 | 340754.55 | 2016.00 | 13027.78 | 10574.75 | 45128 | ILLA13B | 318.0 | AN634 | 2334.00 | | ERUSO, ODITA | 2 | 61230.74 | 866.88 | 0.00 | 0.00 | 6345 | LAR_d_15/16 | 568.12 | ERUSO | 1435.00 | | C_104, C_2, C_226, D_9, LEPINEUX, M_31, M_413 | 7 | 47300.46 | 1113.09 | 6068.62 | 1.81 | 5779 | GDP1333/16 | 1010.91 | AN532 | 2124.00 | @@ -180,61 +182,6 @@ | Entrée(s) sans topographie | 8 | 0.00 | 537.00 | 0.00 | 0.00 | 0 | LT345_79 | 1500.0 | SC_3 | 2037.00 | -------------- -**Développement total topographié par année(s)** -| Année | Dev.(m) | Cumul (m) | Dupl.(m) | Cumul (m) | Surf.(m) | Cumul (m) | -| 1950 | 1724.74 | 1724.74 | 0.00 | 0.00 | 0.00 | 0.00 | -| 1971 | 2627.02 | 4351.76 | 116.43 | 116.43 | 0.00 | 0.00 | -| 1974 | 575.30 | 4927.06 | 0.00 | 116.43 | 0.00 | 0.00 | -| 1976 | 606.16 | 5533.22 | 0.00 | 116.43 | 0.00 | 0.00 | -| 1977 | 1411.32 | 6944.54 | 0.00 | 116.43 | 0.00 | 0.00 | -| 1978 | 2081.24 | 9025.78 | 0.00 | 116.43 | 0.00 | 0.00 | -| 1979 | 5031.79 | 14057.57 | 64.40 | 180.83 | 0.00 | 0.00 | -| 1980 | 940.79 | 14998.36 | 0.00 | 180.83 | 0.00 | 0.00 | -| 1981 | 4122.90 | 19121.26 | 0.00 | 180.83 | 0.00 | 0.00 | -| 1982 | 6422.46 | 25543.72 | 0.00 | 180.83 | 0.00 | 0.00 | -| 1983 | 9040.15 | 34583.87 | 867.57 | 1048.40 | 0.00 | 0.00 | -| 1984 | 5635.70 | 40219.57 | 0.00 | 1048.40 | 0.00 | 0.00 | -| 1985 | 7594.11 | 47813.68 | 0.00 | 1048.40 | 0.00 | 0.00 | -| 1986 | 2747.84 | 50561.52 | 0.00 | 1048.40 | 38.50 | 38.50 | -| 1987 | 10648.06 | 61209.58 | 70.66 | 1119.06 | 0.00 | 38.50 | -| 1988 | 1310.71 | 62520.29 | 0.00 | 1119.06 | 0.00 | 38.50 | -| 1989 | 4088.49 | 66608.78 | 0.00 | 1119.06 | 0.00 | 38.50 | -| 1990 | 6920.12 | 73528.90 | 0.00 | 1119.06 | 0.00 | 38.50 | -| 1991 | 1164.14 | 74693.04 | 0.00 | 1119.06 | 0.00 | 38.50 | -| 1992 | 14467.22 | 89160.26 | 0.00 | 1119.06 | 0.00 | 38.50 | -| 1993 | 19380.69 | 108540.95 | 0.00 | 1119.06 | 0.00 | 38.50 | -| 1994 | 8749.22 | 117290.17 | 0.00 | 1119.06 | 0.00 | 38.50 | -| 1995 | 5661.53 | 122951.70 | 0.00 | 1119.06 | 0.00 | 38.50 | -| 1996 | 8964.07 | 131915.77 | 70.08 | 1189.14 | 0.00 | 38.50 | -| 1997 | 13193.45 | 145109.22 | 0.00 | 1189.14 | 0.00 | 38.50 | -| 1998 | 12640.07 | 157749.29 | 21.10 | 1210.24 | 0.00 | 38.50 | -| 1999 | 10657.59 | 168406.88 | 3706.31 | 4916.55 | 137.44 | 175.94 | -| 2000 | 6419.46 | 174826.34 | 1214.92 | 6131.47 | 409.80 | 585.74 | -| 2001 | 12440.67 | 187267.01 | 596.17 | 6727.64 | 27.39 | 613.13 | -| 2002 | 5107.89 | 192374.90 | 247.31 | 6974.95 | 45.44 | 658.57 | -| 2003 | 3927.29 | 196302.19 | 0.00 | 6974.95 | 406.12 | 1064.69 | -| 2004 | 2645.33 | 198947.52 | 11.06 | 6986.01 | 178.02 | 1242.71 | -| 2005 | 2733.71 | 201681.23 | 0.00 | 6986.01 | 405.03 | 1647.74 | -| 2006 | 7659.27 | 209340.50 | 80.00 | 7066.01 | 203.64 | 1851.38 | -| 2007 | 6496.08 | 215836.58 | 95.38 | 7161.39 | 9.35 | 1860.73 | -| 2008 | 4780.88 | 220617.46 | 0.00 | 7161.39 | 158.13 | 2018.86 | -| 2009 | 4993.39 | 225610.85 | 5.62 | 7167.01 | 941.69 | 2960.55 | -| 2010 | 4700.65 | 230311.50 | 110.00 | 7277.01 | 181.61 | 3142.16 | -| 2011 | 5698.22 | 236009.72 | 0.00 | 7277.01 | 309.63 | 3451.79 | -| 2012 | 9116.66 | 245126.38 | 0.00 | 7277.01 | 1382.85 | 4834.64 | -| 2013 | 9810.78 | 254937.16 | 7.42 | 7284.43 | 527.56 | 5362.20 | -| 2014 | 9800.55 | 264737.71 | 150.80 | 7435.23 | 286.91 | 5649.11 | -| 2015 | 8429.72 | 273167.43 | 113.45 | 7548.68 | 2288.81 | 7937.92 | -| 2016 | 9689.42 | 282856.85 | 885.55 | 8434.23 | 707.05 | 8644.97 | -| 2017 | 4858.50 | 287715.35 | 83.46 | 8517.69 | 294.39 | 8939.36 | -| 2018 | 7369.21 | 295084.56 | 395.87 | 8913.56 | 496.43 | 9435.79 | -| 2019 | 6017.18 | 301101.74 | 289.22 | 9202.78 | 266.20 | 9701.99 | -| 2020 | 5050.76 | 306152.50 | 265.07 | 9467.85 | 24.74 | 9726.73 | -| 2021 | 7945.59 | 314098.09 | 49.80 | 9517.65 | 315.77 | 10042.50 | -| 2022 | 6913.36 | 321011.45 | 1679.14 | 11196.79 | 157.30 | 10199.80 | -| 2023 | 6343.27 | 327354.72 | 1180.34 | 12377.13 | 79.70 | 10279.50 | -| 2024 | 7703.88 | 335058.60 | 547.76 | 12924.89 | 144.72 | 10424.22 | -| 2025 | 5695.94 | 340754.54 | 102.89 | 13027.78 | 150.53 | 10574.75 | **Développement total topographié par année(s)** | Année | Dev.(m) | Cumul (m) | Dupl.(m) | Cumul (m) | Surf.(m) | Cumul (m) | diff --git a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_year.pdf b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_year.pdf index bef5c21..ffe5b89 100644 Binary files a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_year.pdf and b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_year.pdf differ diff --git a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_yearCum.pdf b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_yearCum.pdf index 447a30b..da8956a 100644 Binary files a/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_yearCum.pdf and b/Outputs/stat_database_Synthese-PSM_LARRA_2026-01-08/database_Synthese-PSM_LARRA_yearCum.pdf differ diff --git a/Scripts/pyThStat/pythStat.py b/Scripts/pyThStat/pythStat.py index 12c87cd..6382332 100644 --- a/Scripts/pyThStat/pythStat.py +++ b/Scripts/pyThStat/pythStat.py @@ -1291,12 +1291,13 @@ def calcul_stats(output_file): output_file_ligne_md.extend([ f"--------------\n", - f"- **Script :** {titre[1].strip()}\n", - f"- **Version :** `{titre[2].strip()}`\n", - f"- **Fichier source :** `{titre[3].strip()}`\n", - f"- **Dossier destination :** `{titre[4].strip()}`\n", - f"- **Date :** `{titre[5].strip()}`\n", - f"- **Durée du calcul :** `{titre[6].strip()}`\n", + f"# {titre[1].strip()[2:]}\n", + f"- ** {titre[2].strip()[2:]}**\n", + f"- ** {titre[3].strip()[2:]}**\n", + f"- ** {titre[4].strip()[2:]}**\n", + f"- ** {titre[5].strip()[2:]}**\n", + f"- ** {titre[6].strip()[2:]}**\n", + f"- ** {titre[7].strip()[2:]}**\n", f"--------------\n", ]) @@ -1324,9 +1325,9 @@ def calcul_stats(output_file): output_file_ligne_md.append( f"**Développement total des centerlines (m):** " - f"**, Développement:** {results[0][0]:.2f} " - f"**, Dupliqué:** {results[0][1]:.2f} " - f"**, Surface:** {results[0][2]:.2f}\n" + f", Développement: '{results[0][0]:.2f}'" + f", Dupliqué: '{results[0][1]:.2f}'" + f", Surface: '{results[0][2]:.2f}'\n" ) cursor.execute("SELECT COUNT(*) AS nbre FROM JONCTION WHERE STATION_TYPE IS NULL") @@ -1339,35 +1340,40 @@ def calcul_stats(output_file): results=sql_bilan_reseaux() + def format_markdown_row(row_data): + return '| ' + ' | '.join(f"{str(item):>10}" for item in row_data) + ' |' + if results[0][0] != None :# type: ignore - output_file_ligne_md.append(f"--------------\n") - output_file_ligne_md.append("**Développement total par réseaux**\n") output_file_ligne_csv.append("Développement total par réseaux\n") for row in results: # type: ignore formatted_row = '\t'.join(map(str, row)) output_file_ligne_csv.append('\t' + formatted_row + '\n') - formatted_row = '| ' + ' | '.join(map(str, row)) + ' |' - output_file_ligne_md.append(formatted_row + '\n') #print('Développement total: ' + formatted_row + 'm') + + output_file_ligne_md.append(f"--------------\n") + output_file_ligne_md.append("**Développement total par réseaux**\n") + + headers = ["Entrée(s)", "Nbre", "Dev.(m)", "Prof.(m)", "Dupl.(m)", "Surf.(m)", "Visées", "ID Sta.", "Alt. min(m)", "ID Sta.", "Alt. max(m)"] + output_file_ligne_md.append("| " + " | ".join(headers) + " |\n") + output_file_ligne_md.append("|" + "|".join(["------"] * len(headers)) + "|\n") + + for row in results[1:]: # type: ignore + formatted_row = [str(v) for v in row] + output_file_ligne_md.append("| " + " | ".join(formatted_row) + " |\n") + results=sql_bilan_annee() + if results[0][0] != None :# type: ignore - output_file_ligne_md.append(f"\n--------------\n") - output_file_ligne_md.append("**Développement total topographié par année(s)**\n") output_file_ligne_csv.append("\nDéveloppement total topographié par année(s)**\n") for row in results: # type: ignore if row[1].strip() != "0.00" or row[3].strip() != "0.00" or row[5].strip() != "0.00" : formatted_row = '\t'.join(map(str, row)) output_file_ligne_csv.append('\t' + formatted_row + '\n') - - formatted_row = '| ' + ' | '.join(map(str, row)) + ' |' - output_file_ligne_md.append(formatted_row + '\n') #print('Développement total: ' + formatted_row + 'm') - def format_markdown_row(row_data): - return '| ' + ' | '.join(f"{str(item):>10}" for item in row_data) + ' |' - + output_file_ligne_md.append(f"\n--------------\n") output_file_ligne_md.append("\n**Développement total topographié par année(s)**\n") headers = ["Année", "Dev.(m)", "Cumul (m)", "Dupl.(m)", "Cumul (m)", "Surf.(m)", "Cumul (m)"] @@ -1400,12 +1406,12 @@ def calcul_stats(output_file): if error_count == 0: output_file_ligne_csv[7] = "* Durée calcul: " + duree_formatee + " sans erreur" - output_file_ligne_md[7] = "- **Durée calcul : ** `" + duree_formatee + " sans erreur `\n" + output_file_ligne_md[7] = "- ** Durée calcul : " + duree_formatee + " sans erreur**\n" output_file_ligne_csv[7] = output_file_ligne_csv[7].ljust(120)+"*\n" else : output_file_ligne_csv[7] = "* Durée calcul: " + duree_formatee + " avec erreur(s): " + str(error_count) - output_file_ligne_md[7] = "- **Durée calcul : ** `" + duree_formatee + "!! avec erreur(s):`" + str(error_count) + "`\n" + output_file_ligne_md[7] = "- ** Durée calcul : ** " + duree_formatee + "!! avec erreur(s): " + str(error_count) + "**\n" output_file_ligne_csv[7] = output_file_ligne_csv[7].ljust(120)+"*\n" with open(output_file + ".md", 'w', encoding='utf-8') as file: