merge conflicts

xietongguolv.py

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