修改: PriceSystem/fangjia/__init__.py

修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
This commit is contained in:
罗干
2018-04-04 15:03:01 +08:00
parent 87d9681346
commit e1a67b9b42
3 changed files with 49 additions and 27 deletions
+2 -2
View File
@@ -25,7 +25,7 @@ def get_logger(name):
file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".log") file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".log")
file_handler.setFormatter(formatter) file_handler.setFormatter(formatter)
logger.addHandler(file_handler) logger.addHandler(file_handler)
logger.setLevel("ERROR") logger.setLevel("INFO")
return logger return logger
@@ -39,7 +39,7 @@ def get_performance_logger(name):
file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".performance.log") file_handler = logging.FileHandler("/home/goojia/logs/" + name + ".performance.log")
file_handler.setFormatter(formatter) file_handler.setFormatter(formatter)
logger.addHandler(file_handler) logger.addHandler(file_handler)
logger.setLevel("ERROR") logger.setLevel("INFO")
return logger return logger
now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) now = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
+44 -22
View File
@@ -21,6 +21,7 @@ import pymongo
import sklearn.cluster import sklearn.cluster
import pandas import pandas
import numpy import numpy
import numpy as np
import time import time
import fangjia import fangjia
import sklearn.svm import sklearn.svm
@@ -296,13 +297,13 @@ def commonprice(ct, rl, p):
@timer @timer
def neighbor(lng, lat, scale, ct, rl, p): def neighbor(lng, lat, scale, ct, rl, p):
################### ###################
################### ###################
# timm=20171122 # timm=20171122
################### ###################
################### ###################
estype = p[2] estype = p[2]
# client1 = pymongo.MongoClient('192.168.0.136',27017) # client1 = pymongo.MongoClient('192.168.0.136',27017)
# db1 = client1.fangjia # db1 = client1.fangjia
@@ -310,44 +311,64 @@ def commonprice(ct, rl, p):
kkk = scale / 1000 kkk = scale / 1000
longtitude = lng longtitude = lng
latitude = lat latitude = lat
query1 = {"status": 0, "cat": "district", query1 = {"status": 0, "cat": "district",
"lat2": {"$gt": int(latitude - kkk * 10 ** 10 / 0.86), "$lt": int(latitude + kkk * 10 ** 10 / 0.86)}, "lat2": {"$gt": int(latitude - kkk * 10 ** 10 / 0.86), "$lt": int(latitude + kkk * 10 ** 10 / 0.86)},
"lng2": {"$gt": int(longtitude - kkk * 10 ** 10), "$lt": int(longtitude + kkk * 10 ** 10)}} "lng2": {"$gt": int(longtitude - kkk * 10 ** 10), "$lt": int(longtitude + kkk * 10 ** 10)}}
# fields1 = {"lat2":1,"lng2":1, "city":1,"region":1,"cat":1,"name":1} # fields1 = {"lat2":1,"lng2":1, "city":1,"region":1,"cat":1,"name":1}
fields1 = {"lat2": 1, "lng2": 1, "city": 1, "region": 1, fields1 = {"lat2": 1, "lng2": 1, "city": 1, "region": 1,
"cat": 1, "name": 1, 'estate_type2': 1} "cat": 1, "name": 1, 'estate_type2': 1}
# lct= list( seaweed136.find(query1, fields1)) # lct= list( seaweed136.find(query1, fields1))
# lf=pandas.DataFrame(lct) # lf=pandas.DataFrame(lct)
lf = fangjia.find_seaweed(query1, fields1) lf = fangjia.find_seaweed(query1, fields1)
#print('lf',lf[['estate_type2','lng2', 'lat2']]) #print('lf',lf[['estate_type2','lng2', 'lat2']])
le = lf[lf['estate_type2'] == estype] le = lf[lf['estate_type2'] == estype]
#print('le',le[['estate_type2','lng2', 'lat2']]) #print(le['name'])
le.index = le['name'] le.index = le['name']
lr = le[['lng2', 'lat2']] lr = le[['lng2', 'lat2']]
lr['name1']=le['name']
dirst1 = list(lr.index)
random.shuffle(dirst1) def sort_manhaten(lr):
lr1=lr.values
lr2=[]
for m in range(lr1.shape[0]):
#print(m)
distance=abs(lng-lr1[m][0])+abs(lat-lr1[m][1])
lr2.append(distance/100000)
lr3=np.c_[lr1,lr2]
lrr=lr3[lr3[:,3].argsort()]
return lrr
lr1=sort_manhaten(lr)
dirst1 = list(lr1[:,3])
#random.shuffle(dirst1)
dirst = dirst1[:80] dirst = dirst1[:80]
# print('dirst=',dirst) #print('dirst=',dirst)
dirst_plus = dirst + [p[0]] dirst_plus = dirst + [p[0]]
query_feature = {"city": ct, "region": rl, query_feature = {"city": ct, "region": rl,
"district_name": {"$in": dirst_plus}} "district_name": {"$in": dirst_plus}}
ppp = fangjia.dis_feature(query_feature) ppp = fangjia.dis_feature(query_feature)
# print('ox'*10,ppp) #print('ox'*10,ppp)
# print('小区个数= ',len(dirst)) # print('小区个数= ',len(dirst))
df1 = zhoubian_xiaoqu(ct, rl, dirst) df1 = zhoubian_xiaoqu(ct, rl, dirst)
#print('df1=',df1,'*'*20) #print('df1=',df1,'*'*20)
@@ -356,7 +377,7 @@ def commonprice(ct, rl, p):
#print('df=',df) #print('df=',df)
vv = hh(ppp, df) vv = hh(ppp, df)
# print('#'*36) # print('#'*36)
# print('vv=',vv) #print('vv=',vv)
return vv return vv
else: else:
return numpy.array([]) return numpy.array([])
@@ -397,6 +418,7 @@ def commonprice(ct, rl, p):
#print('le',le[['estate_type2','lng2', 'lat2']]) #print('le',le[['estate_type2','lng2', 'lat2']])
le.index = le['name'] le.index = le['name']
print('EEEEEEEEE')
lr = le[['lng2', 'lat2']] lr = le[['lng2', 'lat2']]
+3 -3
View File
@@ -40,9 +40,9 @@ rl='涧西'
lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村 lk='奥阳康城'上海浦东龚家阁龚家花园绍兴越城辕门新村
南区亨纳斯花园杨浦上海嘉定浏翔花苑北京 昌平 回龙观三期 南区亨纳斯花园杨浦上海嘉定浏翔花苑北京 昌平 回龙观三期
""" """
ct='北京' ct='上海'
rl='昌平' rl='杨浦'
lk='回龙观三期' lk='亨纳斯花园'
#成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁 #成都双流长滩一号 上海 奉贤 朝阳新村##上海 奉贤 棕榈滩别墅深圳龙岗丽皇阁
#洛阳涧西奥阳康城 #洛阳涧西奥阳康城