v1

.idea/misc.xml

@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.11" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (Reuseud_frame_calc)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Sanitary_calculator" project-jdk-type="Python SDK" />
 </project>

.idea/pixi-tool.iml

@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.11 (Reuseud_frame_calc)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Sanitary_calculator" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

.idea/workspace.xml

@@ -8,6 +8,9 @@
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/pixi-tool.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/pixi-tool.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app.py" beforeDir="false" afterPath="$PROJECT_DIR$/app.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data.py" beforeDir="false" afterPath="$PROJECT_DIR$/data.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/output2.txt" beforeDir="false" afterPath="$PROJECT_DIR$/output2.txt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -59,25 +62,26 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "DefaultHtmlFileTemplate": "HTML File",
-    "Python.app.executor": "Run",
-    "Python.calculs.executor": "Run",
-    "Python.data.executor": "Run",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "main",
-    "last_opened_file_path": "C:/Users/gauthier.demonchy/PycharmProjects/Reuseud_frame_calc",
-    "list.type.of.created.stylesheet": "CSS",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
+    &quot;Python.app.executor&quot;: &quot;Run&quot;,
+    &quot;Python.calculs.executor&quot;: &quot;Run&quot;,
+    &quot;Python.data.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/gauthier.demonchy/PycharmProjects/Reuseud_frame_calc&quot;,
+    &quot;list.type.of.created.stylesheet&quot;: &quot;CSS&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RunAnythingCache">
     <option name="myCommands">
       <command value="pip install numpy matplotlib scikit-learn pillow" />
@@ -164,8 +168,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-PY-241.18034.82" />
-        <option value="bundled-python-sdk-975db3bf15a3-2767605e8bc2-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-241.18034.82" />
+        <option value="bundled-js-predefined-d6986cc7102b-09060db00ec0-JavaScript-PY-251.26927.90" />
+        <option value="bundled-python-sdk-41e8cd69c857-64d779b69b7a-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-251.26927.90" />
       </set>
     </attachedChunks>
   </component>
@@ -195,6 +199,13 @@
       <workItem from="1744716843008" duration="82000" />
       <workItem from="1745236741113" duration="499000" />
       <workItem from="1745431338562" duration="5000" />
+      <workItem from="1745431394726" duration="255000" />
+      <workItem from="1749466781819" duration="2343000" />
+      <workItem from="1750170429122" duration="214000" />
+      <workItem from="1754565769546" duration="45000" />
+      <workItem from="1756202953216" duration="449000" />
+      <workItem from="1765528841689" duration="7173000" />
+      <workItem from="1765812400722" duration="590000" />
     </task>
     <task id="LOCAL-00001" summary="v1">
       <option name="closed" value="true" />
@@ -276,7 +287,15 @@
       <option name="project" value="LOCAL" />
       <updated>1744633107181</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="v1">
+      <option name="closed" value="true" />
+      <created>1745431463926</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1745431463926</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -302,10 +321,11 @@
     <option name="LAST_COMMIT_MESSAGE" value="v1" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/imc_gradio_ipynb$app.coverage" NAME="app Coverage Results" MODIFIED="1741708979306" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/data_py$app.coverage" NAME="app Coverage Results" MODIFIED="1742302713551" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/app_py$data.coverage" NAME="data Coverage Results" MODIFIED="1765530440933" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/app_py$calculs.coverage" NAME="calculs Coverage Results" MODIFIED="1741872394315" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/data_py$data.coverage" NAME="data Coverage Results" MODIFIED="1741950630194" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/app_py$app.coverage" NAME="app Coverage Results" MODIFIED="1745236615335" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/imc_gradio_ipynb$app.coverage" NAME="app Coverage Results" MODIFIED="1741708979306" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/app_py$app.coverage" NAME="app Coverage Results" MODIFIED="1765812413365" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>

app.py

@@ -18,7 +18,7 @@ Si le point de croisement est atteint, le remplacement des cadres est intéressa
 # Définition des choix possibles
 options_chauffage = {
     "Pompe à chaleur": ["Pac COPA 2,7",  "Pac COPA 3,2", "Pac COPA 4,4", "Pac COPA 5,3"],
-    "Chaudiere": ["Chaudiere gaz naturel", "Chaudiere pellet", "Chaudiere buche", "Chaudiere biogaz"]
+    "Chaudiere": ["Chaudiere gaz naturel", "Chaudiere pellet", "Chaudiere buche", "Chaudiere biogaz","Chauffage à distance"]
 }
 
 # Mise à jour des options de chauffage dynamiquement
@@ -102,4 +102,4 @@ with gr.Blocks(css="""
                         outputs=[result, image_output])
 
 # Lancer l'interface
-demo.launch()
+demo.launch()

data.py

@@ -1,16 +1,16 @@
 import numpy as np
 import pandas as pd
 
-# Chargement des facteurs d'émission depuis output1.csv
+# Chargement des facteurs d'émission depuis output2.txt
 file_path = "output2.txt"
 factors_df = pd.read_csv(file_path, delimiter=";", names=["Producer", "Emission Factor"], dtype=str, encoding="latin1")
 
-
-# Nettoyage des données
-factors_df["Emission Factor"] = factors_df["Emission Factor"].str.replace(",", ".").astype(float)  # Conversion des nombres
+# Nettoyage des données - suppression des espaces et normalisation
+factors_df["Producer"] = factors_df["Producer"].str.strip()
+factors_df["Emission Factor"] = factors_df["Emission Factor"].str.replace(",", ".").str.strip().astype(float)
 
 # Définition des valeurs de Qh en fonction de Delta Uf établi à partir de lesosai
-q_h_values = np.array([0.000,0.250,0.500,0.750,1.000,1.250,1.472,1.722,1.972,2.222,2.472,2.722,2.944])
+q_h_values = np.array([0.000, 0.250, 0.500, 0.750, 1.000, 1.250, 1.472, 1.722, 1.972, 2.222, 2.472, 2.722, 2.944])
 delta_uf_values = np.array([0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.1, 1.2])
 
 
@@ -19,9 +19,48 @@ def calculate_ges_coefficients(producer_name):
     """
     Calcule le coefficient GES (a) en imposant b = 0.
     """
-    factor = factors_df.loc[factors_df["Producer"] == producer_name, "Emission Factor"].values
+    # Nettoyage du nom recherché
+    producer_name_clean = producer_name.strip()
+
+    # Recherche avec correspondance exacte
+    factor = factors_df.loc[factors_df["Producer"] == producer_name_clean, "Emission Factor"].values
+
+    # Si pas de correspondance exacte, essayer une recherche plus flexible
+    if len(factor) == 0:
+        # Recherche insensible à la casse
+        factor = factors_df.loc[
+            factors_df["Producer"].str.lower() == producer_name_clean.lower(), "Emission Factor"].values
+
+    # Si toujours pas trouvé, utiliser une valeur par défaut basée sur le type
     if len(factor) == 0:
-        raise ValueError(f"Facteur d'émission introuvable pour {producer_name}")
+        # Dictionnaire de valeurs par défaut
+        default_factors = {
+            "Chauffage à distance": 0.066,
+            "Pac COPA 2,7": 0.058,
+            "Pac COPA 5,3": 0.035,
+            "Pac COPA 4,4": 0.040,
+            "Pac COPA 3,2": 0.048,
+            "Chaudiere gaz naturel": 0.230,
+            "Chaudiere biogaz": 0.127,
+            "Chaudiere mazout": 0.324,
+            "Chaudiere buche": 0.033,
+            "Chaudiere pellet": 0.038
+        }
+
+        if producer_name_clean in default_factors:
+            factor = [default_factors[producer_name_clean]]
+        else:
+            # Dernière tentative avec une recherche partielle
+            for key, value in default_factors.items():
+                if key.lower() in producer_name_clean.lower() or producer_name_clean.lower() in key.lower():
+                    factor = [value]
+                    break
+
+            # Si toujours rien trouvé, lever une erreur avec plus d'informations
+            if len(factor) == 0:
+                available_producers = factors_df["Producer"].tolist()
+                raise ValueError(
+                    f"Facteur d'émission introuvable pour '{producer_name_clean}'. Producteurs disponibles : {available_producers}")
 
     factor = factor[0]
     ges_values = q_h_values * factor
@@ -42,6 +81,7 @@ coefficients = {
     "Pac COPA 3,2": calculate_ges_coefficients("Pac COPA 3,2"),
     "Chaudiere pellet": calculate_ges_coefficients("Chaudiere pellet"),
     "Chaudiere buche": calculate_ges_coefficients("Chaudiere buche"),
+    "Chauffage à distance": calculate_ges_coefficients("Chauffage à distance"),
     "Cadre bois": (0.000, 0.041),
     "Cadre bois métal": (0.000, 0.074),
     "Cadre PVC": (0.000, 0.072),
@@ -51,7 +91,7 @@ coefficients = {
 # Données pour la régression Uf selon le type de cadre
 data = {
     "Bois": [1.8, 0.9],
-    "Bois-métal": [1.8, 1],
+    "Bois-métal": [2, 1],
     "PVC": [1.8, 1.3],
-    "Alu": [3.6, 1.35]
-}
+    "Alu": [3.6, 0.8]
+}

output2.txt

@@ -2,8 +2,9 @@ Pac COPA 2,7;0,058
 Pac COPA 5,3;0,035
 Pac COPA 4,4;0,040
 Pac COPA 3,2;0,048
-Chaudiere gaz naturel;0,234
+Chaudiere gaz naturel;0,230
 Chaudiere biogaz;0,127
-Chaudiere mazout;0,0343
+Chaudiere mazout;0,324
 Chaudiere buche;0,033
 Chaudiere pellet;0,038
+Chauffage à distance;0,066