修改: PriceSystem/CalcSpeedMonitor.py

修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
	修改:     PriceSystem/zhuge/zhuge_consist.py
This commit is contained in:
罗干
2018-03-08 10:39:31 +08:00
parent 5454aa6757
commit 660090c79b
4 changed files with 19 additions and 58 deletions
+4 -5
View File
@@ -2,19 +2,18 @@ import json
import multiprocessing
import time
import redis
import config
QUEUE = "calc_cmd"
redis_pool = redis.ConnectionPool(host=config.get_redis_host(), port=6379, db=config.get_redis_db())
redis_pool = redis.ConnectionPool(host='192.168.0.144', port=6379, db=0)
def monitor(pname):
client = redis.Redis(connection_pool=redis_pool)
while True:
pre_counter = client.llen(QUEUE)
time.sleep(60)
print(pname + "##################:".zfill(20) + str(
pre_counter - client.llen(QUEUE)) + "/min")
time.sleep(1)
print(pname + "#####################################:".zfill(100) + str(
pre_counter - client.llen(QUEUE)) + "/s")
def format_cmd(cmd):
+5 -1
View File
@@ -100,9 +100,13 @@ def commonprice(ct, rl, p):
def some_district_information(ct, rl, lk):
query = {"city": ct, "cat": "sell", "region": rl,
query = {"city": ct, "cat": "sell", "region": rl,杨王村公寓
"district_name": {"$in": lk},
"p_date": {"$gt": some_district_information_time}}
#['total_price', 'area', 'region', 'district_name', 'url', 'block', 'p_date']
fields1 = {'total_price':1, 'area':1, 'region':1, 'district_name':1, 'url':1, 'p_date':1}
return fangjia.findHouse(query)
"""
+3 -2
View File
@@ -4,9 +4,10 @@ import time
import sell_price.zhuge0118A as sellPrice
s = time.time()
ct = '上海'
rl = '奉贤'
lk = '杨王村公寓'
rl = '闵行'
lk = '上海康城'
weekend = datetime.datetime.strptime("2018-03-11", "%Y-%m-%d")
sellPrice.out_put_price(ct, rl, lk, weekend)
+7 -50
View File
@@ -14,7 +14,7 @@ from fangjia import timer
@timer
def url_lable(dmi1):
company_list=['lianjia','zhuge','5i5j','iwjw','fangdd','centanet', 'cityhouse','esf','baixing','ganji','anjuke','58']
company_list=['lianjia','zhuge','5i5j','iwjw','fangdd','centanet', 'cityhouse','baixing','ganji','anjuke','58']
##有Bug
for p in company_list:
for k in dmi1.index:
@@ -26,7 +26,7 @@ def url_lable(dmi1):
def url_to_root(url):
company_list = ['lianjia', 'zhuge', '5i5j', 'iwjw', 'fangdd', 'centanet', 'cityhouse', 'esf', 'baixing', 'ganji',
company_list = ['lianjia', 'zhuge', '5i5j', 'iwjw', 'fangdd', 'centanet', 'cityhouse', 'baixing', 'ganji',
'anjuke', '58']
for c in company_list:
if c in url:
@@ -66,40 +66,7 @@ def drop_rubbish(dd1):
def zhuge_out(ddd):
#print('我在诸葛文件内',ddd)
'''
def url_lable(company_list,dmi1):
for p in company_list:
#print('p=',p)
for k in dmi1.index:
#print('k=',k)
#print(dmi1['url'][k])
ff=dmi1['url'][k]
if type(ff)==str:
if p in dmi1['url'][k]:
dmi1['url'][k]=p
return dmi1
def drop_rubbish(dd1):
for i in dd1.index:
pp=dd1['url'][i]
# print(pp)
if type(pp)==str:
if len(pp)>12 :
dd1=dd1.drop(i)
return dd1
'''
def k_means(pp,clus):
from sklearn.cluster import KMeans
pv=list(pp)
@@ -303,12 +270,12 @@ def zhuge_out(ddd):
company_list=['lianjia','zhuge','5i5j','iwjw','fangdd','centanet',
'cityhouse','esf','baixing','ganji','anjuke','58']
'cityhouse','baixing','ganji','anjuke','58']
company_name=['链家','诸葛找房','我爱我家','爱屋吉屋','房多多','中原',
'城市房产','二手房','百姓','赶集','安居客','58同城']
'城市房产','百姓','赶集','安居客','58同城']
company_values=[10, 10, 5, 5, 3, 2,
1 , 1, 1, 1, 1, 1]
1 , 1, 1, 1, 1]
#companypp=[]
import numpy as np
@@ -361,17 +328,7 @@ def zhuge_out(ddd):
ddo=opfm(ddo,'floor')
ddo=opfm(ddo,'room')
"""
floor_column=ddo['floor'].dropna()
print('floor_column=',floor_column)
most_floor=Counter(floor_column).most_common(1)
print('floor=',ddo['floor'])
ddo['floor']=ddo['floor'].fillna(most_floor[0][0])
room_column=ddo['room'].dropna()
most_room=Counter(room_column).most_common(1)
ddo['room']=ddo['room'].fillna(most_room[0][0])
"""
ddo['area']=(ddo['area']//2)*2+1