diff --git a/file.txt b/file.txt new file mode 100644 index 0000000000000000000000000000000000000000..ba6ab5abdc4a80defa5315cf26001b8a106ab77c --- /dev/null +++ b/file.txt @@ -0,0 +1 @@ +Contenu du fichier file.txt \ No newline at end of file diff --git a/file_sub.txt b/file_sub.txt new file mode 100644 index 0000000000000000000000000000000000000000..bf8b4392b3084cbadffad91db0e0941c9bcc458c --- /dev/null +++ b/file_sub.txt @@ -0,0 +1 @@ +Contenu du fichier file_sub.txt \ No newline at end of file diff --git a/src/Class_Mod/RegModels.py b/src/Class_Mod/RegModels.py index ef87faf6385192ec006467e30d66e983e90ad0c1..ba81e1ed0c6ad1098ba196593f9a95c860645ad6 100644 --- a/src/Class_Mod/RegModels.py +++ b/src/Class_Mod/RegModels.py @@ -61,7 +61,7 @@ class Regmodel(object): a = " No transformation was performed" SG = f'- Savitzky-Golay derivative parameters (Window_length:{self._best['window_length']}; polynomial order: {self._best['polyorder']}; Derivative order : {self._best['deriv']})' - Norm = f'- Spectral Normalization: {a}' + Norm = f'- Spectral Normalization \: {a}' return SG+"\n"+Norm @property diff --git a/src/Report/figures/.gitignore b/src/Report/figures/.gitignore deleted file mode 100644 index c96a04f008ee21e260b28f7701595ed59e2839e3..0000000000000000000000000000000000000000 --- a/src/Report/figures/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/src/Report/report.log b/src/Report/report.log index 4225c0b85eaad3a14fbb019130787c3b82ac841d..906dd850ee23b775f140e0aab069faad647588c1 100644 --- a/src/Report/report.log +++ b/src/Report/report.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.141592653-2.6-1.40.25 (MiKTeX 24.1) (preloaded format=pdflatex 2024.5.6) 3 JUN 2024 16:22 +This is pdfTeX, Version 3.141592653-2.6-1.40.25 (MiKTeX 24.1) (preloaded format=pdflatex 2024.5.6) 4 JUN 2024 12:03 entering extended mode restricted \write18 enabled. %&-line parsing enabled. diff --git a/src/Report/report.py b/src/Report/report.py index 00ea16008930254da8b4f5efb95e24844d97b8d7..6396d1dd0b992e7f5b6b5750623c309e30bb8c29 100644 --- a/src/Report/report.py +++ b/src/Report/report.py @@ -108,7 +108,8 @@ def report(*args): """ latex_report += r""" \begin{center} - """ + df1.to_latex(escape=True) + r""" + Model performance + \end{center} """ latex_report += r""" @@ -442,4 +443,17 @@ def compile_latex(): # open the report proc = subprocess.Popen([str(filename[:-4]) + '.pdf'], cwd = filename_path, shell=True) proc.communicate() + import os + import zipfile + + folder_path = 'D:/Mouhcine/nirs_workflow/src/Report/figures' + zip_path = 'D:/Mouhcine/nirs_workflow/src/Report/archive_zipfile.zip' + + with zipfile.ZipFile(zip_path, 'w', compression=zipfile.ZIP_DEFLATED, compresslevel=9) as zf: + for root, dirs, files in os.walk(folder_path): + for file in files: + file_path = os.path.join(root, file) + arcname = os.path.relpath(file_path, folder_path) + zf.write(file_path, arcname) + # compile_latex() diff --git a/src/Report/texput.log b/src/Report/texput.log deleted file mode 100644 index e3dbbcf39a3ee7016981fb36c48cfb26ab142231..0000000000000000000000000000000000000000 --- a/src/Report/texput.log +++ /dev/null @@ -1,21 +0,0 @@ -This is pdfTeX, Version 3.141592653-2.6-1.40.25 (MiKTeX 24.1) (preloaded format=pdflatex 2024.5.6) 3 JUN 2024 13:24 -entering extended mode - restricted \write18 enabled. - %&-line parsing enabled. -** - -! Emergency stop. -<*> - -End of file on the terminal! - - -Here is how much of TeX's memory you used: - 0 strings out of 474485 - 1 string characters out of 5742319 - 1924542 words of memory out of 5000000 - 22394 multiletter control sequences out of 15000+600000 - 558069 words of font info for 36 fonts, out of 8000000 for 9000 - 1141 hyphenation exceptions out of 8191 - 0i,0n,0p,1b,6s stack positions out of 10000i,1000n,20000p,200000b,200000s -! ==> Fatal error occurred, no output PDF file produced! diff --git a/src/data/params/Preprocessing.json b/src/data/params/Preprocessing.json index 2862b4a3366d05534f6c0f7fb2b77bc3ecde0e78..0a854030b608d37b5178fb049bc60d88867b66a5 100644 --- a/src/data/params/Preprocessing.json +++ b/src/data/params/Preprocessing.json @@ -1 +1 @@ -{"deriv": 1, "n_components": \ No newline at end of file +{"deriv": 0, "n_components": \ No newline at end of file diff --git a/src/pages/1-samples_selection.py b/src/pages/1-samples_selection.py index 16b049b6ec7069446e3f311e890dcef0a9026f8a..a30e15e9b743656132755c45e5b5f5aebc9fce3d 100644 --- a/src/pages/1-samples_selection.py +++ b/src/pages/1-samples_selection.py @@ -1,7 +1,15 @@ from Packages import * st.set_page_config(page_title="NIRS Utils", page_icon=":goat:", layout="wide") from Modules import * - +repertoire_a_vider = 'D:/Mouhcine/nirs_workflow/src/Report/figures' + +if os.path.exists(repertoire_a_vider): + for fichier in os.listdir(repertoire_a_vider): + chemin_fichier = os.path.join(repertoire_a_vider, fichier) + if os.path.isfile(chemin_fichier) or os.path.islink(chemin_fichier): + os.unlink(chemin_fichier) + elif os.path.isdir(chemin_fichier): + shutil.rmtree(chemin_fichier) # HTML pour le bandeau "CEFE - CNRS" # bandeau_html = """ # <div style="width: 100%; background-color: #4682B4; padding: 10px; margin-bottom: 10px;"> diff --git a/src/pages/2-model_creation.py b/src/pages/2-model_creation.py index 729db1838827b31e25cd0e03c70335ada93250a6..22274507e073a7643df72e659fe9d4b8baef419f 100644 --- a/src/pages/2-model_creation.py +++ b/src/pages/2-model_creation.py @@ -13,6 +13,25 @@ add_header() import matplotlib.pyplot as plt, mpld3 import streamlit.components.v1 as components +repertoire_a_vider = 'D:/Mouhcine/nirs_workflow/src/Report/figures' + +if os.path.exists(repertoire_a_vider): + for fichier in os.listdir(repertoire_a_vider): + chemin_fichier = os.path.join(repertoire_a_vider, fichier) + if os.path.isfile(chemin_fichier) or os.path.islink(chemin_fichier): + os.unlink(chemin_fichier) + elif os.path.isdir(chemin_fichier): + shutil.rmtree(chemin_fichier) +# HTML pour le bandeau "CEFE - CNRS" + +json_sp=pd.DataFrame() + + + + + + + st.session_state["interface"] = st.session_state.get('interface') if st.session_state["interface"] == 'simple': hide_pages("Predictions") @@ -301,6 +320,8 @@ if not spectra.empty and not y.empty: fig1.add_shape(type='line', x0 = .95 * min(Reg.cv_data_[2].loc[:,'Measured']), x1 = 1.05 * max(Reg.cv_data_[2].loc[:,'Measured']), y0 = .95 * min(Reg.cv_data_[2].loc[:,'Measured']), y1 = 1.05 * max(Reg.cv_data_[2].loc[:,'Measured']), line = dict(color='black', dash = "dash")) fig1.update_traces(marker_size=7, showlegend=False) cv2.plotly_chart(fig1) + fig1.write_image("./Report/figures/Allinone.png") + fig0 = px.scatter(Reg.cv_data_[2], x ='Measured', y = 'Predicted' , trendline='ols', color='Folds', symbol="Folds", facet_col = 'Folds',facet_col_wrap=1, color_discrete_sequence=px.colors.qualitative.G10, text='index', width=800, height=1000) fig0.update_traces(marker_size=8, showlegend=False) @@ -315,10 +336,13 @@ if not spectra.empty and not y.empty: #if M1.write('-- Spectral preprocessing info --') + M1.write(Reg.best_hyperparams_print) - with open("data/params/Preprocessing.json", "w") as outfile: - json.dump(Reg.best_hyperparams_, outfile) - + a_Test=Reg.best_hyperparams_print + + # with open("data/params/Preprocessing.json", "w") as outfile: + # json.dump(Reg.best_hyperparams_, outfile) +########## M1.write("-- Model performance --") M1.dataframe(metrics(c = [y_train, yc], t = [y_test, yt], method='regression').scores_) M2.write("-- Model performance --") @@ -391,7 +415,7 @@ with st.container(): header3, header4 = st.columns(2) if header3.button("Exporter le RR"): if regression_algo == reg_algo[1]: - latex_report = report.report(LoDaSum, 'model',Ac_Km,json_sp,model_per,'full_plsr',cv99) + latex_report = report.report(LoDaSum, 'model',Ac_Km,a_Test,json_sp,model_per,'full_plsr',cv99) report.compile_latex() else: pass