diff --git a/src/Class_Mod/RegModels.py b/src/Class_Mod/RegModels.py index 49813dbdd93dc5ca4a2a08d0c413a202fb3cf2cb..056253d9148483608628553d00b195f6808b57f4 100644 --- a/src/Class_Mod/RegModels.py +++ b/src/Class_Mod/RegModels.py @@ -44,17 +44,17 @@ class Regmodel(object): return self.pretreated @property - def get_params_(self): + def get_params_(self):### This method return the search space where the optimization algorithm will search for optimal subset of hyperparameters return self._hyper_params def objective(self, params): pass @property - def best_hyperparams_(self): + def best_hyperparams_(self): ### This method returns the subset of selected hyperparametes return self._best @property - def best_hyperparams_print(self): + def best_hyperparams_print(self):### This method returns a sentence telling what signal preprocessing method was applied if self._best['normalization'] == 'Snv': a = 'Standard Normal Variate (SNV)' @@ -66,15 +66,15 @@ class Regmodel(object): return SG+"\n"+Norm @property - def model_(self): + def model_(self): # This method returns the developed model return self._model @property - def pred_data_(self): + def pred_data_(self): ## this method returns the predicted data in training and testing steps return self._yc, self._yt @property - def cv_data_(self): + def cv_data_(self): ## Cross validation data return self._ycv @property @@ -91,7 +91,7 @@ class Regmodel(object): def sel_ratio_(self): return self._sel_ratio -########################################### ######################################### +########################################### PLSR ######################################### class Plsr(Regmodel): def __init__(self, train, test, n_iter = 10): super().__init__(train, test, n_iter, add_hyperparams = {'n_components': hp.randint('n_components', 2,20)}) @@ -141,7 +141,7 @@ class Plsr(Regmodel): return score - ############################################ ######################################### + ############################################ iplsr ######################################### class TpeIpls(Regmodel): def __init__(self, train, test, n_iter = 10, n_intervall = 5): self.n_intervall = n_intervall @@ -216,7 +216,9 @@ class TpeIpls(Regmodel): return score - ############################################ ######################################### + + ########################################### LWPLSR ######################################### + ############################################ Pcr ######################################### class Pcr(Regmodel): def __init__(self, train, test, n_iter = 10, n_val = 5): diff --git a/src/Modules.py b/src/Modules.py index c399a6ec5019f5daba315b26bf8330ede04c53c3..ba9e78454bea329013c893e864d5b1042b72ef1a 100644 --- a/src/Modules.py +++ b/src/Modules.py @@ -3,6 +3,7 @@ from Class_Mod import Plsr, LinearPCA, Umap, find_col_index, PinardPlsr, Nmf, AP from Class_Mod import LWPLSR, list_files, metrics, TpeIpls, reg_plot, resid_plot, Sk_Kmeans, DxRead, Hdbscan, read_dx, PlsProcess from Class_Mod.DATA_HANDLING import * from Class_Mod.Miscellaneous import prediction, download_results, plot_spectra, local_css +from Class_Mod.Hash import create_hash, check_hash from Report import report css_file = Path("style/") pages_folder = Path("pages/") @@ -10,10 +11,3 @@ from style.header import add_header, add_sidebar from config.config import pdflatex_path local_css(css_file / "style.css") -# path = os.path.dirname(os.path.abspath(__file__)).replace('\\','/') -# d1 = path.find('/') -# css_file = path[:d1]+'/style' -# st.session_state["interface"] = st.session_state.get('interface') -# if st.session_state["interface"] == 'simple': -# hide_pages("Predictions") -# local_css(css_file +"/style.css") diff --git a/src/data/hash/cat.exe b/src/data/hash/cat.exe new file mode 100644 index 0000000000000000000000000000000000000000..6a6af4dffec047267df4e7841b7b77edc2f1fb2a Binary files /dev/null and b/src/data/hash/cat.exe differ diff --git a/src/data/hash/grep.exe b/src/data/hash/grep.exe new file mode 100644 index 0000000000000000000000000000000000000000..427f92fc52edb2aab6162357032bd5530d0cb9e7 Binary files /dev/null and b/src/data/hash/grep.exe differ diff --git a/src/data/hash/hash.txt b/src/data/hash/hash.txt new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391