修改: PriceSystem/sell_price/zhuge0118A.py

This commit is contained in:
罗干
2018-06-06 14:59:50 +08:00
parent 0c8080cd3d
commit ff50d3db08
+17 -6
View File
@@ -1380,7 +1380,10 @@ def commonprice(ct, rl, p,weekend):
# #####print('s=',s)
dd22=ddd11['total_price']/ddd11['area']
#这个函数已经弃用,等价于直接对房源的均价进行聚类懒得改了
#怕改了以后引起其他问题,期待新算法工程是的杰作
def compelex(ddd11, s, neighb, junjia):
#cc1 = ddd11['avg'].dropna()
@@ -1444,6 +1447,8 @@ def commonprice(ct, rl, p,weekend):
return junjia['kmzg'] * 1.0, float('%.2f' % credit['0.6']), value_type[
'自身样本'], sample_size
##print('ddd11=',ddd11)
#通过未协调一致出均价的第三方均价和房源数据计算出
junjia_km = compelex(ddd11, s, neighb[0], junjia)
return junjia_km
@@ -1463,14 +1468,14 @@ def commonprice(ct, rl, p,weekend):
return neighb[0], float('%.2f' % credit['0.5']), value_type['周边楼盘'], neighb[1]
elif dglg != None:
#####print('优质第三方均价2 = ', dglg)
#这几行代码应该可以去掉,懒得改了
sample_size = len(junjia)
return dglg, float('%.2f' % credit['0.8']), value_type['第三方'], sample_size # '优质样本'
else:
##print('lgggggg=')
#采用周边楼盘计算
##print('neighb[0]=',neighb[0])
return neighb[0], float('%.2f' % credit['0.5']), value_type['周边楼盘'], neighb[1]
@@ -1502,6 +1507,7 @@ def commonprice(ct, rl, p,weekend):
else:
#本价格通过周边楼盘计算 得到
return neighb[0], float('%.2f' % credit['0.5']), value_type['周边楼盘'], neighb[1]
@@ -1532,6 +1538,7 @@ pt = fangjia.get_collection("fangjia_log", "problem_command", config.get_log_mon
#pt = fangjia.get_collection("fangjia_log", "problem_command", '192.168.10.182', 27017)
#################################################################
#提取某个小区的所有时间
def region_district_list_lk(ct, rl, lk):
# import pandas
# client1 = pymongo.MongoClient('192.168.0.136',27017)
@@ -1547,7 +1554,7 @@ def region_district_list_lk(ct, rl, lk):
lf = fangjia.find_seaweed(query1, fields1)
return lf
#本函数用于计算上一周的时间
def last_sunday(weekend):
######print('weekend_up',weekend)
@@ -1564,6 +1571,8 @@ def last_sunday(weekend):
# last_sunday=last_sunday(weekend)
#计算小区的周涨跌幅度
#在计算时锁定上一周与这一周的时间限制
def make_up_price(ct, rl, lk, weekend):
#####print('lg=',ct,rl,lk)
@@ -1573,6 +1582,7 @@ def make_up_price(ct, rl, lk, weekend):
# cc=last_sunday
#提取上一周的时间
ly = last_sunday(weekend)
# stat= fangjia.get_collection("fangjia_stat","test_lg5", '192.168.0.136',27017)
#stat = stat
@@ -1580,7 +1590,8 @@ def make_up_price(ct, rl, lk, weekend):
}
pos1 = list(stat.find(query).limit(30))
#提取上一周的价格
pos = pandas.DataFrame(pos1)
# pos=timestamp_to_int(pos)
@@ -1757,7 +1768,7 @@ def out_put_price(ct, rl, lk, weekend):
#print('mm=',mm)
#print(ct, rl, lk, avg, 'avg=',avg,'$' * 20)
try:
#保存数据
stat_save(ct,rl,p,weekend,mm,c_date,m_date,make_up,estate_type,avg)
#pt_up(ct,rl,p,weekend,c_date,cmd_estate_type)