From d678f01d38461df08b78cedb3609ed74cfd569e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=B9=B2?= Date: Mon, 26 Mar 2018 10:55:38 +0800 Subject: [PATCH] =?UTF-8?q?=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20Pr?= =?UTF-8?q?iceSystem/sell=5Fprice/zhuge0118A.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PriceSystem/sell_price/zhuge0118A.py | 42 +++++++++++++++++----------- PriceSystem/test.py | 2 +- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/PriceSystem/sell_price/zhuge0118A.py b/PriceSystem/sell_price/zhuge0118A.py index b42027e..3729e3c 100644 --- a/PriceSystem/sell_price/zhuge0118A.py +++ b/PriceSystem/sell_price/zhuge0118A.py @@ -45,7 +45,7 @@ some_district_information_time = front_step_time(360) zhoubian_xiaoqu_time = front_step_time(200) # 第三方均价的数据时间上限,如从201703之后的数据 -dsfjujia_time = front_step_time(430) // 100 +dsfjujia_time = front_step_time(200) // 100 ############################################################ ############################################################ @@ -805,7 +805,7 @@ def commonprice(ct, rl, p): else: return int(pp1.mean()) - def group(junjia_lzf, junjia_anst, ctr): + def group(junjia_lzf, junjia_anst, ctr,per): bb = [] for i in junjia_lzf.index: @@ -813,13 +813,13 @@ def commonprice(ct, rl, p): someprice = junjia_lzf[i] def compare15(b): - if 100 * abs(someprice - b) / b < 16: + if 100 * abs(someprice - b) / b < per: return 1 else: return 0 countmap = list(map(compare15, junjia_anst)) - # print('countmap=',countmap) + #print('countmap=',countmap) countmap1 = pandas.Series(countmap) countmap2 = countmap1[countmap1 > 0] # print('countmap2=',countmap2) @@ -828,6 +828,7 @@ def commonprice(ct, rl, p): # print('len(countmap2)=',len(countmap2)) if numb > ctr: bb.append([someprice, numb]) + #print('bb=',bb) return bb def middle_operate(junjia_lzf, junjia_anst): @@ -837,27 +838,27 @@ def commonprice(ct, rl, p): # print('junjia_lzf=',junjia_lzf) # print('junjia_anst=',junjia_anst) - def mid_out_1(junjia_lzf): + def mid_out_1(junjia_lzf,per): if len(junjia_lzf) > 1: # print('aa1',aa) - bb = group(junjia_lzf, junjia_lzf, 1) + bb = group(junjia_lzf, junjia_lzf, 1,per) # print('bb=',bb) if len(bb) > 0: bb1 = pandas.DataFrame(bb, columns=['price', 'count']) bb2 = bb1.sort_values(by='count', ascending=False) - # print(bb2) + #print(bb2) return bb2.iloc[0]['price'] else: return None else: return None - def mid_out_2(junjia_lzf, junjia_anst): + def mid_out_2(junjia_lzf, junjia_anst,per): if len(junjia_lzf) > 0 and len(junjia_anst) > 0: - bb = group(junjia_lzf, junjia_anst, 0) + bb = group(junjia_lzf, junjia_anst, 0,per) # print('bb1=',bb) if len(bb) > 0: bb1 = pandas.DataFrame(bb, columns=['price', 'count']) @@ -869,13 +870,21 @@ def commonprice(ct, rl, p): else: return None - a11 = mid_out_1(junjia_lzf) - a22 = mid_out_2(junjia_lzf, junjia_anst) - a33 = mid_out_1(junjia_anst) - aa1_3 = pandas.Series([a11, a22, a33]).dropna() - # print(a11,a22,a33) - if len(aa1_3) > 0: - return aa1_3.iloc[0] + a11 = mid_out_1(junjia_lzf,8) + + #print('a11=',a11) + a22 = mid_out_2(junjia_lzf, junjia_anst,8) + #print('a22=',a22) + a33 = mid_out_1(junjia_anst,8) + a44 = mid_out_1(junjia_lzf,16) + a55 = mid_out_2(junjia_lzf, junjia_anst,16) + a66 = mid_out_1(junjia_anst,16) + #print('a33=',a33) + aa1_6 = pandas.Series([a11, a22, a33,a44,a55,a66]).dropna() + + #print('aa1_6=',aa1_6) + if len(aa1_6) > 0: + return aa1_6.iloc[0] else: return None @@ -913,6 +922,7 @@ def commonprice(ct, rl, p): bl = ['anjuke_esf_price', 'soufang_esf_price', 'tuboshi_esf_price', + 'ganji_esf_price' ] # ppd3dp=ppd3['total_price'].dropna() diff --git a/PriceSystem/test.py b/PriceSystem/test.py index 1161c6e..4234931 100644 --- a/PriceSystem/test.py +++ b/PriceSystem/test.py @@ -32,7 +32,7 @@ ct = '广州' rl = '海珠' lk = '会展世界城三期' ''' -#成都- 都江堰- 溪岭雪# +#成都- 都江堰- 溪岭雪#上海徐汇 百汇园西 安 未央 兴乐园 弘和美邻馆 ct='西安' rl='未央' lk='金仕华城'