qiangge
/
oschina_recommendation
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge conflicts

This commit is contained in:
nigel 2019-03-17 17:22:42 +08:00
parent c38f9dfbf2 d1f97b44fb
commit ae601733a9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xietongguolv.py
View File

@ -197,7 +197,6 @@ def getRatings():
return data return data
# dic_new: is the new dict # dic_new: is the new dict
# dic_old: is the previous dict # dic_old: is the previous dict
def changedUser(dic_new, dic_old): def changedUser(dic_new, dic_old):
@ -290,10 +289,10 @@ class myThread(threading.Thread):
changedArticleSet = changed_user_dict[uid] changedArticleSet = changed_user_dict[uid]
time2 = time.time() time2 = time.time()
# print("查看用户阅读情况是否有变化，时间为：%.2f" % (time2 - time1)) # print("查看用户阅读情况是否有变化，时间为：%.2f" % (time2 - time1))
if len(changedArticleSet) > 0: if len(changedArticleSet) > 0:
# print("user " + str(uid) + "'s article reading result has changed") # print("user " + str(uid) + "'s article reading result has changed")
# relation_result.setdefault(uid, {}) # relation_result.setdefault(uid, {})
time3 = time.time() time3 = time.time()
aSet1 = u_aSet_map_new[uid] aSet1 = u_aSet_map_new[uid]
denominator1 = 0.0 denominator1 = 0.0