add second device portrait

src/models/esmm/fe/tractate_fe.py

@@ -288,13 +288,13 @@ CATEGORICAL_COLUMNS = [
     "click_tractate_id5",
     "is_related_service",
     "service_city",
-    # "device_fd2",
-    # "device_sd2",
-    # "device_fs2",
-    # "device_ss2",
-    # "device_fp2",
-    # "device_sp2",
-    # "device_p2",
+    "device_fd2",
+    "device_sd2",
+    "device_fs2",
+    "device_ss2",
+    "device_fp2",
+    "device_sp2",
+    "device_p2",
     # "device_fd3",
     # "device_sd3",
     # "device_fs3",
@@ -434,13 +434,13 @@ def join_features(device_df, tractate_df, cc_df):
     df["device_sp"] = df["second_positions_x"].apply(lambda x: nth_element(x, 0))
     df["device_p"] = df["projects_x"].apply(lambda x: nth_element(x, 0))
 
-    # df["device_fd2"] = df["first_demands_x"].apply(lambda x: nth_element(x, 1))
-    # df["device_sd2"] = df["second_demands_x"].apply(lambda x: nth_element(x, 1))
-    # df["device_fs2"] = df["first_solutions_x"].apply(lambda x: nth_element(x, 1))
-    # df["device_ss2"] = df["second_solutions_x"].apply(lambda x: nth_element(x, 1))
-    # df["device_fp2"] = df["first_positions_x"].apply(lambda x: nth_element(x, 1))
-    # df["device_sp2"] = df["second_positions_x"].apply(lambda x: nth_element(x, 1))
-    # df["device_p2"] = df["projects_x"].apply(lambda x: nth_element(x, 1))
+    df["device_fd2"] = df["first_demands_x"].apply(lambda x: nth_element(x, 1))
+    df["device_sd2"] = df["second_demands_x"].apply(lambda x: nth_element(x, 1))
+    df["device_fs2"] = df["first_solutions_x"].apply(lambda x: nth_element(x, 1))
+    df["device_ss2"] = df["second_solutions_x"].apply(lambda x: nth_element(x, 1))
+    df["device_fp2"] = df["first_positions_x"].apply(lambda x: nth_element(x, 1))
+    df["device_sp2"] = df["second_positions_x"].apply(lambda x: nth_element(x, 1))
+    df["device_p2"] = df["projects_x"].apply(lambda x: nth_element(x, 1))
 
     # df["device_fd3"] = df["first_demands_x"].apply(lambda x: nth_element(x, 2))
     # df["device_sd3"] = df["second_demands_x"].apply(lambda x: nth_element(x, 2))
@@ -538,13 +538,13 @@ def device_tractate_fe(device_id, tractate_ids, device_dict, tractate_dict):
     device_info["device_fp"] = nth_element(device_fp, 0)
     device_info["device_sp"] = nth_element(device_sp, 0)
     device_info["device_p"] = nth_element(device_p, 0)
-    # device_info["device_fd2"] = nth_element(device_fd, 1)
-    # device_info["device_sd2"] = nth_element(device_sd, 1)
-    # device_info["device_fs2"] = nth_element(device_fs, 1)
-    # device_info["device_ss2"] = nth_element(device_ss, 1)
-    # device_info["device_fp2"] = nth_element(device_fp, 1)
-    # device_info["device_sp2"] = nth_element(device_sp, 1)
-    # device_info["device_p2"] = nth_element(device_p, 1)
+    device_info["device_fd2"] = nth_element(device_fd, 1)
+    device_info["device_sd2"] = nth_element(device_sd, 1)
+    device_info["device_fs2"] = nth_element(device_fs, 1)
+    device_info["device_ss2"] = nth_element(device_ss, 1)
+    device_info["device_fp2"] = nth_element(device_fp, 1)
+    device_info["device_sp2"] = nth_element(device_sp, 1)
+    device_info["device_p2"] = nth_element(device_p, 1)
     # device_info["device_fd3"] = nth_element(device_fd, 2)
     # device_info["device_sd3"] = nth_element(device_sd, 2)
     # device_info["device_fs3"] = nth_element(device_fs, 2)

src/models/esmm/tractate_model.py

@@ -167,13 +167,13 @@ _categorical_columns = [
     "click_tractate_id4",
     "click_tractate_id5",
     "service_city",
-    # "device_fd2",
-    # "device_sd2",
-    # "device_fs2",
-    # "device_ss2",
-    # "device_fp2",
-    # "device_sp2",
-    # "device_p2",
+    "device_fd2",
+    "device_sd2",
+    "device_fs2",
+    "device_ss2",
+    "device_fp2",
+    "device_sp2",
+    "device_p2",
     # "device_fd3",
     # "device_sd3",
     # "device_fs3",