diff --git a/.obsidian/plugins/obsidian-git/obsidian_askpass.sh b/.obsidian/plugins/obsidian-git/obsidian_askpass.sh old mode 100755 new mode 100644 diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 95a6df9..8149f7f 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -11,24 +11,26 @@ "id": "d7edff405bbcbd43", "type": "leaf", "state": { - "type": "markdown", + "type": "split-diff-view", "state": { - "file": "ISEN/FHS/CIPA4/Anthropologie de l'entreprise/Mythe Horoquartz.md", - "mode": "source", - "source": false, - "backlinks": true, - "backlinkOpts": { - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": true - } + "aFile": ".obsidian/workspace.json", + "bFile": ".obsidian/workspace.json", + "aRef": "" }, - "icon": "lucide-file", - "title": "Mythe Horoquartz" + "icon": "diff", + "title": "Diff: workspace.json" + } + }, + { + "id": "d5d2a69d64b2cf52", + "type": "leaf", + "state": { + "type": "release-notes", + "state": { + "currentVersion": "1.9.14" + }, + "icon": "lucide-book-up", + "title": "Release Notes 1.9.14" } }, { @@ -79,7 +81,8 @@ "title": "TD1_signal_m1_original" } } - ] + ], + "currentTab": 1 } ], "direction": "vertical" @@ -252,8 +255,13 @@ "obsidian-git:Open Git source control": false } }, - "active": "d7edff405bbcbd43", + "active": "d5d2a69d64b2cf52", "lastOpenFiles": [ + "ISEN/BDD/CIPA4/modelisation-cas-immo.md", + "ISEN/BDD/CIPA4/Cas modélisation alternatifs.md", + "ISEN/BDD/CIPA4/BDD Cours 1.md", + "ISEN/BDD/CIPA4/BDD Cours 2.md", + "ISEN/FHS/CIPA4/Anthropologie de l'entreprise/Mythe Horoquartz.md", "ISEN/FHS/CIPA4/Anthropologie de l'entreprise/Anthropologie de l'entreprise Cours 1.md", "ISEN/BDD/CIPA4/Projet/Présentation projet.md", "Untitled.base", @@ -292,11 +300,6 @@ "ISEN/Réseau/CIPA4/TP/TP M02 Conversion.md", "ISEN/Réseau/A1/Cisco Cours 2.md", "ISEN/Réseau/A2/CCNA Cours 1.md", - "ISEN/Réseau/A1/Cisco Cours 1.md", - "ISEN/Réseau/A2/CCNA Cours 2.md", - "ISEN/Réseau/A2/CCNA Cours 3.md", - "ISEN/Réseau/A1/Cisco Cours 4.md", - "ISEN/Réseau/A1/Cisco Cours 5.md", "ISEN/Réseau/A2/TP Ansible et docker.canvas", "ISEN/BDD/CIR2/TD2.canvas", "Pasted image 20250905143950.png", diff --git a/ISEN/BDD/CIPA4/Projet/.gitignore b/ISEN/BDD/CIPA4/Projet/.gitignore index 7b144fb..e05365d 100644 --- a/ISEN/BDD/CIPA4/Projet/.gitignore +++ b/ISEN/BDD/CIPA4/Projet/.gitignore @@ -26,5 +26,3 @@ **/.env data-cleanup/.env - -**/carte_installations_france.html \ No newline at end of file diff --git a/ISEN/BDD/CIPA4/Projet/Scatter_Plot_Query_11.png b/ISEN/BDD/CIPA4/Projet/Scatter_Plot_Query_11.png new file mode 100644 index 0000000..cc4a6cb Binary files /dev/null and b/ISEN/BDD/CIPA4/Projet/Scatter_Plot_Query_11.png differ diff --git a/ISEN/BDD/CIPA4/Projet/carte_installations_france.html b/ISEN/BDD/CIPA4/Projet/carte_installations_france.html new file mode 100644 index 0000000..6cda6e6 --- /dev/null +++ b/ISEN/BDD/CIPA4/Projet/carte_installations_france.html @@ -0,0 +1,5861 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/__init__.py b/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/__init__.py old mode 100755 new mode 100644 diff --git a/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/clean_data.py b/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/clean_data.py old mode 100755 new mode 100644 diff --git a/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/map_visualization.py b/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/map_visualization.py index e43bc10..4213374 100644 --- a/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/map_visualization.py +++ b/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/map_visualization.py @@ -218,7 +218,7 @@ def main(): carte = create_map(df, regions_geojson, departements_geojson) # Save map - output_file = 'carte_installations_france.html' + output_file = '../carte_installations_france.html' carte.save(output_file) print(f"\nMap saved in: {output_file}") diff --git a/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/query_11.py b/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/query_11.py new file mode 100644 index 0000000..412b937 --- /dev/null +++ b/ISEN/BDD/CIPA4/Projet/data-cleanup/src/data_cleanup/query_11.py @@ -0,0 +1,25 @@ +import psycopg2 +import pandas as pd +import matplotlib.pyplot as plt +from config import DB_CONFIG + +conn = psycopg2.connect(**DB_CONFIG) + +query = """ + SELECT puissance_crete, surface + FROM Installation + WHERE surface IS NOT NULL AND puissance_crete IS NOT NULL AND surface > 0 AND surface < 1000 + ORDER BY surface + LIMIT 100; \ + """ +df = pd.read_sql_query(query, conn) + +conn.close() + +plt.figure(figsize=(10, 6)) +plt.scatter(df['surface'], df['puissance_crete'], alpha=0.5) +plt.title('Scatter Plot: Puissance Crête vs Surface') +plt.xlabel('Surface (m²)') +plt.ylabel('Puissance Crête (W)') +plt.grid(True) +plt.show() diff --git a/ISEN/BDD/CIPA4/Projet/run_results.sh b/ISEN/BDD/CIPA4/Projet/run_results.sh old mode 100755 new mode 100644