From 80ac86c5d8ceb581dd01839aa13f8d6011e6c54b Mon Sep 17 00:00:00 2001 From: govin08 Date: Wed, 31 Jul 2024 18:20:36 +0900 Subject: [PATCH] deleted argument named 'filename' --- .../preprocess_daily.cpython-312.pyc | Bin 79401 -> 79097 bytes Scripts/preprocess_daily.py | 12 +- analysis/0725_main_test/4_use_class_pd.ipynb | 245 ++---------------- 3 files changed, 22 insertions(+), 235 deletions(-) diff --git a/Scripts/__pycache__/preprocess_daily.cpython-312.pyc b/Scripts/__pycache__/preprocess_daily.cpython-312.pyc index 9d8021a63117e09a767a023c8bf3d8f9766642ff..98fe6fb086a05b395f3d0652afe3c5ac05e3fd48 100644 GIT binary patch delta 7475 zcmai333OD~d7eA_Xhy>#AwXi0#O47BG?KvB7|bqKvD$2bVVHT621YZJ``#d+;GwB~ zY#bXKUpoU{SiFQ_Viz*CMHa_)>V~?l4V?Pa?sI$^65FX$n&Rdhr(V;0Z{m2>o$I{Xg8~teF**4?zv%#nBlkDjC{P^g%gZ}^iX{XJWx9t^s zZIRwNn_iS|e; z+Nr6X-UBM=8|!nLPF+j3$-!#2Z@7~TX;WK#n}ZJun{B`CovQKoIN$OPD_r!A6KaHi zU1gQ<)qQLu_)Lf5epX+x*yVWLiasNV)AxkqDQrm89(@4D)?`AXHw(m#x-p+PwjFa^^+>(QTNQ>iNzYIm?ygw)-^ z1`#ft3oaN{aXU?#K10)uNW+bdVYw2ER~5?Y9rntZXwL`S3RntQ2540cQ=aNrj^<(l z)0;@eBJqUOLZxyMMi&C617-o15SX6M^iD03N=uM6z3HsMTdscqEeY8rn3EgSjD~6M z!Dy~kT@B-E%FrwaR066A%#uXP&?HfhYsB444Z4`F!r`H%o3H{333=sMbz69qX97m* zZ0h*Yia;_QjYo{=wxp&{E?fvlO6~vSC^X#quux|{^p>_ePD6q8BW!!~zbqF+)aGU7 z`K?Y-GVlR=%-(K`**6ch+4kA@QkV{-ILlo2sTFf-RnwfRf%}{WtieBf?c2wwSI<Nr!Tu0G~<3Y#%Sy*amj zP+c#ju{JqupU;?52+Z3lDuzqw!t`jVoe7yv^(aLho*y38gb9DFLyPU0n@C0FZppsU ztUjEdm^ucNz6HBtTEXUN}J9GG%B>(D|Cj2`rn?GR*$k z&BI#CO8&0Q2^>0S2o0Sta{-6>T5fWkuL-s^yUsVesI3nAE0o!Cb3H?(OBIF9i(hjOTtPj#8n6a%n+mVoK9Jqqs>!Kq6N*! zZUXXYawwVZ(q-SC2QlG@CX@0w)}2sGRyT>U>WFW_KptOjvnWt1X`@l?Pzf-+ks^zozcWisYs?Hs%tWd5qoE+?BvGs)xJt2?GVtyB3H()PdA0P+N0ex=Ciw|JzHiA>a z^u*H1Y-dWBZPX9BD!qxdrXN8V)o79e}$4F+iJoLe>ghy&`Xze=iMC zUS{>O7Pn#r6vaZbz>-B|>6poDMNoD6+%Tu$$FL7^ARi|%-BQCvD4)Q{QNS_4VZae} zOdpvWOgU7R0lWapX{50(P1_MC_ZfhmS4+k9u7uGcU#4xQGnvp0)3GO!VdpcQv2_m^}O$P_VDw@HO)4k`cBXx}F_cjn4W-Rbf*0{Xyf|TiAu!XW7*Mg7Y0# z9I+QJQd93fBc4B6u zQGhA}qMz-|SeaoN2KNIvAP|U@H1$j)?s?OlNyK&}HS6vTSnBV|HmS6_>%cHETOB>H zRZLKugCkVcy`|z%A$0ExPBBsa+rf2#{^g6B`@jtGin`;0m6VcvAHw087E@4LJZ9r{=P!{c*rgUM2<8CjW%#M0T6p>se|u(3*ZKu<|P zCm=j+Pd={rved6_7*hRXTk?Wdt?5ca@xNuSa|J$VT55XRk9GRC5Y=~rhC zmydi8<6i*21f1X%QP~b}?N*l$4=shdLj$cWswvlzDMLYh{sxSRsHPfi)5PJ$F_7 zDc%`Pnm*)-2n6l*hd#@Hi}+nDw}bUo+S3}kLFTWKW2#k@EWogvsW+=nUYs?t&%=L> z!@B`6Eb=$iqj(yzV&x&VrF&>c7X6=M(P3&KcW2~X7{en*!ZyTcVZl z1D-&aVjD z%?C4cAYT+LG`U}#@}=|$=3yzzJWr#=R31XB2EbZk4i&m#J6mSbe0~g;=yc^RxFH1K%?NT!OF* zJ&rEB)lsyL1K?n$S2tud(cXbPbnW?lbo)-_1N#_*1NL(pcz64>h9)Vn~p+@=l z*w-%~-UzSBSsr7$cSe(0O*cJl^q?`clq|qb2La3ybMq^7+2`4X*z@?V7z5I5d{!c7 zB0S|~3xFNs`)EA};99mBq@LmPzl*_>fbRiL0e+2X_LAq(E#@lI%N9+f+AXI!gIT`4 zcA~}g8kb(|LmUQ0|CPlE2-R8Tktfp_wyH69CNPV7PEs*N-&YzFaZC2S76O7!i zCj3Vx$6~S@{ut-}1aKBSpGE5jfCAue051T3gxMF->IR$x{E#OAF9CiED4LyKOH@l* zUwP0je!ihBi`E%^$JCEc^81gtyFacaozd|i@V7q24$);k+DvMKb zZI^r%!!8*u-Yc=~@KPv?u+n{CV{SS_6QIc?9zF-5s8 zeS1OY6->OEf3#GL&hab8iBXQamoatCHQ}OJ)2;2IppRQ=n*$jJG6VdW(KWUU!j(#H zGRZ=j?zBpWes4WX1+#HNk*iQYJ(Og7-T>g5F$`N{zzDE^^4G(h}zz!J`}CD=g!ZPI}j5~5W?(f5I3^<{mx zC~_uw6K7Ud{_5_{qeY7d^{p@7yVu{Df1_HA5}Ev!YB4MK@8G-78#z1l9mP4<8`rc9 zKdjjtm0%ZzmzBNve&mqpXF@DtKSyX<>6;TR8CHq> z>#^whGf|@>lF)U!*D3YTN;{aN4@f%`T9@vkHOz&akbjx}Iw4}+A2*1bMO6ccego^9 zVA1{`2J#CVMU6=1I~qlO0Cz$w@wbtF=bvj76LU9UCvTsGRvqA<0G9x70xke90_p*i z0esdv@aE(%s9SJ$1h5ql1#APv0CB*2zy`oZz$QRbIoO>F_yT?KN3v~i5|ysOuHpYZ zF@K;*JSD>U`erdcH<)Hk4|Jhx@sNY=efoFMrbaJSYzQaUQ@u+S+yGi~_HdrN0Jo=s}A dWJ_L~DkcSX3=$(gwgInh%s)O=9N>5R{{qW@>*@di delta 7660 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 inc_angle + self.angle_separation]\n", - "inc_angle_pedes = np.sort(inc_angles_left)[0] % 360\n", - "\n", - "# 보행신호시의 진입로 엣지id\n", - "inc_angle2edge = p2inc_angle2edge[parent_id]\n", - "inc_edge_id_pedes = inc_angle2edge[inc_angle_pedes]\n", - "\n", - "# 진출로 각도 목록\n", - "out_angles = cmatch.dropna(subset=['inc_angle', 'out_angle']).out_angle.astype(int).unique()\n", - "out_angles = np.sort(out_angles)\n", - "out_angles = list(out_angles - 360) + list(out_angles) + list(out_angles + 360)\n", - "out_angles = np.array(out_angles)\n", - "\n", - "# 보행신호시의 진출로 각도\n", - "out_angles_right = out_angles[out_angles <= inc_angle - self.angle_separation]\n", - "out_angle_pedes = np.sort(out_angles_right)[-1] % 360\n", - "\n", - "# 보행신호시의 진출로 엣지id\n", - "out_angle2edge = p2out_angle2edge[parent_id]\n", - "out_edge_id_pedes = out_angle2edge[out_angle_pedes]\n", - "\n", - "# 진입엣지/진출엣지 포함 조건\n", - "inc_true = (cmatch.inc_edge_id==adj_inc_edge_id)\n", - "out_true = (cmatch.out_edge_id==adj_out_edge_id)\n", - "\n", - "# 보행신호시 조건\n", - "pedes_flag = (cmatch.inc_edge_id==inc_edge_id_pedes) & (cmatch.out_edge_id==out_edge_id_pedes)\n", - "\n", - "# 좌회전시 조건\n", - "right_flag = inc_true & (cmatch.turn_type=='left')\n", - "\n", - "# 보행신호이동류(17) 조건\n", - "crosswalk_on = (cmatch.move_no==17) & ~ out_true\n", - "\n", - "# 신호없음이동류(18) 조건\n", - "all_redsigns = (cmatch.move_no==18) & ~ out_true" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "print(type(inc_edge_id))\n", - "print(type(out_edge_id))\n", - "print(cmatch[['inc_edge_id', 'out_edge_id']].info())" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "print(inc_edge_id, out_edge_id)\n", - "# 보행신호시/좌회전시 진입/진출 엣지id 배정\n", - "cmatch[['inc_edge_id', 'out_edge_id']] = None\n", - "if condition == \"보행신호시\":\n", - " cmatch.loc[pedes_flag, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id]\n", - "elif condition == \"좌회전시\":\n", - " cmatch.loc[right_flag, ['inc_edge_id', 'out_edge_id']] = [inc_edge_id, out_edge_id]\n", - "\n", - "uturn_not_assigned = cmatch[['inc_edge_id','out_edge_id']].isna().any(axis=1).all()\n" - ] - }, - { - "cell_type": "code", - "execution_count": 9, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "2-1. 매칭 테이블들을 생성했습니다.\n", - "2-2. 초기화 신호가 지정되었습니다. (우회전 : g)\n", - "2-3. 유턴 인덱스 / 비보호좌회전 인덱스를 지정했습니다.\n", - "2-4. 직진 및 좌회전(G)을 배정했습니다.\n", - "2-5. node2num_cycles.json를 저장했습니다.\n" - ] - } - ], - "source": [ - "# 2. 중간산출물 만들기\n", - "# 2-1 매칭테이블 생성\n", - "self.get_matches()\n", - "# 2-2 신호 초기화\n", - "self.initialize_state()\n", - "# 2-3 유턴 인덱스 / 비보호좌회전 인덱스 지정\n", - "self.assign_indices()\n", - "# 2-4 신호배정\n", - "self.assign_signals()\n", - "# 2-5 기반파일 저장\n", - "self.save_intermediates()" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ + "# 3. 이슈사항 저장\n", "self.write_issues()" ] }