diff --git a/PriceSystem/feature/region_feature.py b/PriceSystem/feature/region_feature.py index a38ff05..b9427e9 100644 --- a/PriceSystem/feature/region_feature.py +++ b/PriceSystem/feature/region_feature.py @@ -127,70 +127,75 @@ def disanganf_price(ct,rl,lk,timd,timm): def rent_partial_sell(ct,rl,timd,timm): rele0=sample_pool(ct,rl,timd,timm) - ##print(rele0) - rele1=rele0[['district_name','p_date','area','total_price']] - rele1['total_price']=rele1['total_price']/rele1['area'] - #print('up_rele.shape[0]=',rele1.shape[0]) + print('rele0=',rele0) - rele=rele0.drop_duplicates(['district_name']) + if rele0.shape[0]>0: + rele1=rele0[['district_name','p_date','area','total_price']] + rele1['total_price']=rele1['total_price']/rele1['area'] + #print('up_rele.shape[0]=',rele1.shape[0]) + + rele=rele0.drop_duplicates(['district_name']) + + p1=rele['district_name'].dropna() + p2=list(set(p1)) + + ###print('*****************************************************************') + dd=disanganf_price(ct,rl,p2,timd,timm) + ###print('rele.shape[0]=',rele.shape[0]) - p1=rele['district_name'].dropna() - p2=list(set(p1)) - - ###print('*****************************************************************') - dd=disanganf_price(ct,rl,p2,timd,timm) - ###print('rele.shape[0]=',rele.shape[0]) - - if rele.shape[0]>10: - - rele['total_price']=rele['total_price']/rele['area'] - #rent_most=k_means(rele['total_price']) - rele['sell_rent_ratio']=1 - rv=rele[['total_price','district_name','area','sell_rent_ratio']].dropna() - rv1=rv.values - ro=[] - sell_rent_ratio=[] - for k in range(len(rv1)): - namee=rv1[k][1] - pee1= rele1[rele1['district_name']==namee] - pee2=pee1.sort_values(by='p_date',ascending=False) - price=pee2['total_price'].iloc[0] - ro.append(price) - #price=rv1[k][0] - if namee in dd.index: - - sell=dd[namee] - ppoo=sell/price - sell_rent_ratio.append(ppoo) - #rv1[k][3]=sell/price - ###print('rele0=',rele) - rent_most=k_means(pandas.Series(ro)) - #rele=pd.DataFrame(rv1,columns=rv.columns) - roseries=pandas.Series(sell_rent_ratio) - - roseries=roseries[roseries>5] - - #rele=rele[rele['sell_rent_ratio']>5] - ##print('sell_rent_ratio=',list(rele['sell_rent_ratio'])[:5]) - ##print(rele) - ##print('#######################') - ##print(rele.shape[0]) - if len(roseries)>10: + if rele.shape[0]>10: + rele['total_price']=rele['total_price']/rele['area'] #rent_most=k_means(rele['total_price']) + rele['sell_rent_ratio']=1 + rv=rele[['total_price','district_name','area','sell_rent_ratio']].dropna() + rv1=rv.values + ro=[] + sell_rent_ratio=[] + for k in range(len(rv1)): + namee=rv1[k][1] + pee1= rele1[rele1['district_name']==namee] + pee2=pee1.sort_values(by='p_date',ascending=False) + price=pee2['total_price'].iloc[0] + ro.append(price) + #price=rv1[k][0] + if namee in dd.index: + + sell=dd[namee] + ppoo=sell/price + sell_rent_ratio.append(ppoo) + #rv1[k][3]=sell/price + ###print('rele0=',rele) + rent_most=k_means(pandas.Series(ro)) + #rele=pd.DataFrame(rv1,columns=rv.columns) + roseries=pandas.Series(sell_rent_ratio) - ##print('rele.shape[0]=',rele.shape[0]) - #print('yyyyyyyyyyyyyyyyyyyyyy=',len(roseries)) - rent_sell=k_means(roseries.dropna()) + roseries=roseries[roseries>5] - del rele - return rent_sell,rent_most + #rele=rele[rele['sell_rent_ratio']>5] + ##print('sell_rent_ratio=',list(rele['sell_rent_ratio'])[:5]) + ##print(rele) + ##print('#######################') + ##print(rele.shape[0]) + if len(roseries)>10: + + #rent_most=k_means(rele['total_price']) + + ##print('rele.shape[0]=',rele.shape[0]) + #print('yyyyyyyyyyyyyyyyyyyyyy=',len(roseries)) + rent_sell=k_means(roseries.dropna()) + + del rele + return rent_sell,rent_most + else: + del rele + return '没有区域租售比',rent_most else: del rele - return '没有区域租售比',rent_most + return '没有区域租售比','没有区域租金数据' else: - del rele - return '没有区域租售比','没有区域租金数据' + return '没有任何数据','没有任何数据' + def dff(i,j,timd,timm): #666666666666666666666666666666666666666666666666666666 reef=rent_partial_sell(i,j,timd,timm) diff --git a/PriceSystem/rent_price/district_map0413.py b/PriceSystem/rent_price/district_map0413.py index fcfdfe0..16c0975 100644 --- a/PriceSystem/rent_price/district_map0413.py +++ b/PriceSystem/rent_price/district_map0413.py @@ -336,6 +336,7 @@ def common_rent_price(ct,rl,p,timd,timm,region_feature,mongodb): def RENT_no_data_mostblock_price(ct,rl,dd,rf,p,timd,timm): lk=p[0] + print('rf=',rf) rent_ratio=rf[0] most_rent=rf[1] if dd.shape[0]>1: @@ -971,7 +972,7 @@ def save_to_mongo(ct,rl,lk,timd,timm): region_feature=add_region_fea(ct,rl,None) - #print('region_feature=',region_feature) + print('region_feature=',region_feature) #print('b_time=',time.time()-b) @@ -990,49 +991,51 @@ def save_to_mongo(ct,rl,lk,timd,timm): ###print('region_feature',region_feature) ##print('pos=',pos) #c=time.time() - mm=common_rent_price(ct,rl,p,timd,timm,region_feature,None) - #print('c_time=',time.time()-c) - ##print(ct,rl,p[0],mm) - #d=time.time() - mmup=dis_make_up_price(ct,rl,p[0],timm) - #print('mmup=',mmup) - #print('mm=',mm) - make_up=return_operate(mmup,mm) - #print('d_time=',time.time()-d) - ###print('p=',p) - - def c_date(): - date1=datetime.datetime.now() + if len(region_feature)>0: + mm=common_rent_price(ct,rl,p,timd,timm,region_feature,None) + #print('c_time=',time.time()-c) + ##print(ct,rl,p[0],mm) - pacific = pytz.timezone('Asia/Shanghai') - return pacific.localize(date1) - date=c_date() - #weekend=20161231 - print("######################## ","ct=",ct,"rl=",rl,"lk=",p[0],"mm=",mm,make_up) - """ - client1 = pymongo.MongoClient('192.168.0.136',27017) - db1 = client1.fangjia_stat - stat = db1.test_lg55 - - - #stat= fangjia.get_collection("fangjia_stat","test_lg5", '192.168.0.136',27017) - save_lg.save({"city":ct,"region":rl,"district_name":p[0],"make_up":make_up, - "avg_price":mm, "c_date":date,"weekend":timme,"cat":'district'}) - save_lg=client136.fangjia_stat.rent_1221 - """ - if type(mm)!=str and mm!=None: + #d=time.time() + mmup=dis_make_up_price(ct,rl,p[0],timm) + #print('mmup=',mmup) + #print('mm=',mm) + make_up=return_operate(mmup,mm) + #print('d_time=',time.time()-d) + ###print('p=',p) - mm=float(mm) - #get_sqm_rentprice_db() - save_lg=lg_db - save_lg.replace_one( + def c_date(): + date1=datetime.datetime.now() + + pacific = pytz.timezone('Asia/Shanghai') + return pacific.localize(date1) + date=c_date() + #weekend=20161231 + print("######################## ","ct=",ct,"rl=",rl,"lk=",p[0],"mm=",mm,make_up) + """ + client1 = pymongo.MongoClient('192.168.0.136',27017) + db1 = client1.fangjia_stat + stat = db1.test_lg55 - {"city":ct,"region":rl,"district_name":p[0],"weekend":timme}, - - {"city":ct,"region":rl,"district_name":p[0],"markup":make_up, - "avg_price":mm, "c_date":date,"weekend":timme,"cat":'district'},True - ) + + #stat= fangjia.get_collection("fangjia_stat","test_lg5", '192.168.0.136',27017) + save_lg.save({"city":ct,"region":rl,"district_name":p[0],"make_up":make_up, + "avg_price":mm, "c_date":date,"weekend":timme,"cat":'district'}) + save_lg=client136.fangjia_stat.rent_1221 + """ + if type(mm)!=str and mm!=None: + + mm=float(mm) + #get_sqm_rentprice_db() + save_lg=lg_db + save_lg.replace_one( + + {"city":ct,"region":rl,"district_name":p[0],"weekend":timme}, + + {"city":ct,"region":rl,"district_name":p[0],"markup":make_up, + "avg_price":mm, "c_date":date,"weekend":timme,"cat":'district'},True + ) diff --git a/PriceSystem/rent_test.py b/PriceSystem/rent_test.py index 8ff1f26..8ebd9e2 100644 --- a/PriceSystem/rent_test.py +++ b/PriceSystem/rent_test.py @@ -16,11 +16,11 @@ def get_weekend(tt): weekend = get_weekend('20180515') -ct='上海' +ct='琼中' -rl='青浦' -lk='馨浦苑'#上海闵行闵浦新苑一村普陀曹杨一村上海北京东城左安漪园 -#黄浦伯爵居静安泰安里长宁新泾北苑上海奉贤海岸景苑闵行陇兴别墅 +rl='琼中' +lk='阳江雅苑养生城二期'#上海闵行闵浦新苑一村普陀曹杨一村上海北京东城左安漪园 +#黄浦伯爵居静安泰安里长宁新泾北苑上海奉贤海岸景苑闵行陇兴别墅阳江雅苑养生城二期 timm=20180430 timd=20170531