From 6e4b1a7a03ef2c9c64a9432ce53ee8cfb23b5ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BD=A6=E9=92=8A?= <zhangyanzhao@igengmei.com>
Date: Fri, 30 Nov 2018 11:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9str.cat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tensnsorflow/ffm.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tensnsorflow/ffm.py b/tensnsorflow/ffm.py
index 650842b5..2956e0ce 100644
--- a/tensnsorflow/ffm.py
+++ b/tensnsorflow/ffm.py
@@ -21,7 +21,7 @@ def get_data():
     db = pymysql.connect(host='10.66.157.22', port=4000, user='root', passwd='3SYz54LS9#^9sBvC', db='jerry_prod')
     sql = "select * from esmm_data where stat_date >= '2018-11-20'"
     esmm = con_sql(db,sql)
-    esmm = esmm.rename(columns={0:"stat_date",1: "device_id",2:"ucity_id",3:"cid_id",4:"diary_service_id",5:"y_old",
+    esmm = esmm.rename(columns={0:"stat_date",1: "device_id",2:"ucity_id",3:"cid_id",4:"diary_service_id",5:"y",
                                 6:"z",7:"clevel1_id",8:"slevel1_id"})
     print("esmm data ok")
     print(esmm.head())
@@ -39,9 +39,10 @@ def get_data():
     df["clevel1_id"] = df["clevel1_id"].astype("str")
     df["slevel1_id"] = df["slevel1_id"].astype("str")
     df["cid_id"] = df["cid_id"].astype("str")
-    df["y_old"] = df["y_old"].astype("str")
+    df["y"] = df["y"].astype("str")
     df["z"] = df["z"].astype("str")
-    df["y"] = df["device_id"].str.cat(df[["ucity_id", "cid_id", "y_old", "z"]], sep=",")
+    df["y"] = df["device_id"].str.cat([df["ucity_id"].values.tolist(), df["cid_id"].values.tolist(),
+                                       df["y"].values.tolist(),df["z"].values.tolist()], sep=",")
     df = df.drop("z", axis=1)
     df = df[df["stat_date"] != "2018-11-25"]
     transform(df,"train")
-- 
2.18.0