Update utils.py

utils.py

@@ -8,14 +8,14 @@ import joblib
 import matplotlib.pyplot as plt
 
 # Explainer path
-explainer_filename = "explainer.bz2"
+explainer_filename = "models/explainer_old.bz2"
 
 feature_names = ['PROPERTY: BCC/FCC/other', 'PROPERTY: Calculated Density (g/cm$^3$)',
        'PROPERTY: Calculated Young modulus (GPa)',
-       #'PROPERTY: Processing method', 'PROPERTY: Microstructure',
-       #'PROPERTY: Single/Multiphase', 'Microstructure One Hot',
-       #'Processing Method One Hot', 'BCC/FCC/other One Hot',
-       #'Single/Multiphase One Hot',
+       'PROPERTY: Processing method', 'PROPERTY: Microstructure',
+       'PROPERTY: Single/Multiphase', 'Microstructure One Hot',
+       'Processing Method One Hot', 'BCC/FCC/other One Hot',
+       'Single/Multiphase One Hot',
        'Microstructure B2',
        'Microstructure B2+BCC', 'Microstructure B2+L12',
        'Microstructure B2+Laves+Sec.', 'Microstructure B2+Sec.',
@@ -43,8 +43,8 @@ feature_names = ['PROPERTY: BCC/FCC/other', 'PROPERTY: Calculated Density (g/cm$
        'Preprocessing method CAST', 'Preprocessing method OTHER',
        'Preprocessing method POWDER', 'Preprocessing method WROUGHT',
        'BCC/FCC/other BCC', 'BCC/FCC/other FCC', 'BCC/FCC/other OTHER',
-       #'Single/Multiphase ',
-        'Single/Multiphase M', 'Single/Multiphase S']
+       'Single/Multiphase ',
+       'Single/Multiphase M', 'Single/Multiphase S']
 
 def return_feature_names():
     return feature_names
@@ -140,44 +140,9 @@ def return_num_classes_one_hot(df):
             "Num classes single/multiphase": num_classes_single_multiphase,
             "Num classes bcc/fcc/other": num_classes_bcc_fcc_other}
 
-# def turn_into_one_hot(X, mapping_dict):
-#     one_hot = X
-#     num_classes_one_hot = {'Num classes microstructure': 45, 'Num classes preprocessing': 5,
-#                            'Num classes single/multiphase': 3, 'Num classes bcc/fcc/other': 3}
-#     one_hot["Microstructure One Hot"] = X["PROPERTY: Microstructure"].apply(to_categorical_num_classes_microstructure, num_classes_one_hot=num_classes_one_hot)
-#     one_hot["Processing Method One Hot"] = X["PROPERTY: Processing method"].apply(to_categorical_num_classes_processing,
-#         num_classes_one_hot=num_classes_one_hot)
-#     one_hot["BCC/FCC/other One Hot"] = X["PROPERTY: BCC/FCC/other"].apply(to_categorical_bcc_fcc_other,
-#         num_classes_one_hot=num_classes_one_hot)
-#     one_hot["Single/Multiphase One Hot"] = X["PROPERTY: Single/Multiphase"].apply(to_categorical_single_multiphase,
-#         num_classes_one_hot=num_classes_one_hot)
-
-#     flatten_microstructure = one_hot["Microstructure One Hot"].apply(pd.Series)
-#     flatten_processing = one_hot["Processing Method One Hot"].apply(pd.Series)
-#     flatten_bcc_fcc_other = one_hot["BCC/FCC/other One Hot"].apply(pd.Series)
-#     flatten_single_multiphase = one_hot["Single/Multiphase One Hot"].apply(pd.Series)
-
-#     one_hot.drop(columns=["Microstructure One Hot", "Processing Method One Hot", "BCC/FCC/other One Hot",
-#                           "Single/Multiphase One Hot"])
-
-#     for column in flatten_microstructure.columns:
-#         one_hot["Microstructure " + str(
-#             list(mapping_dict["PROPERTY: Microstructure"].keys())[int(column)])] = flatten_microstructure[int(column)]
-#     for column in flatten_processing.columns:
-#         one_hot["Preprocessing method " + str(list(mapping_dict["PROPERTY: Processing method"].keys())[int(column)])] = flatten_processing[column]
-#     for column in flatten_bcc_fcc_other.columns:
-#         one_hot["BCC/FCC/other " + str(list(mapping_dict["PROPERTY: BCC/FCC/other"].keys())[int(column)])] = flatten_bcc_fcc_other[column]
-#     for column in flatten_single_multiphase.columns:
-#         one_hot["Single/Multiphase " + str(list(mapping_dict["PROPERTY: Single/Multiphase"].keys())[int(column)])] = flatten_single_multiphase[column]
-    
-#     one_hot = one_hot.drop(columns=["PROPERTY: Microstructure", "Microstructure One Hot", "BCC/FCC/other One Hot", "Single/Multiphase One Hot",
-#                                     "Processing Method One Hot", "PROPERTY: Processing method", "PROPERTY: BCC/FCC/other", "PROPERTY: Single/Multiphase"])
-#     return one_hot
-
-
 def turn_into_one_hot(X, mapping_dict):
     one_hot = X
-    num_classes_one_hot = {'Num classes microstructure': 30, 'Num classes preprocessing': 5,
+    num_classes_one_hot = {'Num classes microstructure': 45, 'Num classes preprocessing': 5,
                            'Num classes single/multiphase': 3, 'Num classes bcc/fcc/other': 3}
     one_hot["Microstructure One Hot"] = X["PROPERTY: Microstructure"].apply(to_categorical_num_classes_microstructure, num_classes_one_hot=num_classes_one_hot)
     one_hot["Processing Method One Hot"] = X["PROPERTY: Processing method"].apply(to_categorical_num_classes_processing,
@@ -205,5 +170,6 @@ def turn_into_one_hot(X, mapping_dict):
     for column in flatten_single_multiphase.columns:
         one_hot["Single/Multiphase " + str(list(mapping_dict["PROPERTY: Single/Multiphase"].keys())[int(column)])] = flatten_single_multiphase[column]
     
-    one_hot = one_hot.drop(columns=["PROPERTY: Microstructure", "Microstructure One Hot", "BCC/FCC/other One Hot", "Single/Multiphase One Hot", "Processing Method One Hot", "PROPERTY: Processing method", "PROPERTY: BCC/FCC/other", "PROPERTY: Single/Multiphase"])
+    one_hot = one_hot.drop(columns=["PROPERTY: Microstructure", "Microstructure One Hot", "BCC/FCC/other One Hot", "Single/Multiphase One Hot",
+                                    "Processing Method One Hot", "PROPERTY: Processing method", "PROPERTY: BCC/FCC/other", "PROPERTY: Single/Multiphase"])
     return one_hot