diff --git a/Results/sn_1704419700.add.xml b/Results/sn_1704419700.add.xml index d816c8fc1..9e4d97c92 100644 --- a/Results/sn_1704419700.add.xml +++ b/Results/sn_1704419700.add.xml @@ -1,50 +1,50 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -84,290 +84,310 @@ - + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -388,7 +408,7 @@ - + @@ -428,242 +448,242 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - - - + - - + + - - - - - + + - + + + + - - + + - - - - - + + - + + + + - - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/Scripts/preprocess_daily.py b/Scripts/preprocess_daily.py index ba11f34f1..33c9eac0a 100644 --- a/Scripts/preprocess_daily.py +++ b/Scripts/preprocess_daily.py @@ -201,6 +201,15 @@ class DailyPreprocessor(): 'inter_nos' : self.inter_nos} with open(os.path.join(self.path_intermediates, 'ids.json'), 'w') as file: json.dump(ids, file) + + # parent node만 가져옴. + inter_node1 = self.inter_node[self.inter_node.inter_type == 'parent'].drop('inter_type', axis=1) + inter_info1 = self.inter_info[['inter_no', 'inter_lat', 'inter_lon']] + inter = pd.merge(inter_node1, inter_info1, how='left', left_on=['inter_no'], + right_on=['inter_no']).drop_duplicates() + + self.inter2node = dict(zip(inter['inter_no'], inter['node_id'])) + print("1-5. 주요 객체 (리스트, 딕셔너리)들을 저장했습니다.") # 2. 중간산출물 만들기 @@ -337,14 +346,6 @@ class DailyPreprocessor(): 컬럼명 : inter_no, phase_no, ring_type, move_no, inc_dire, out_dire, inc_angle, out_angle, inc_edge_id, out_edge_id, node_id ''' - # parent node만 가져옴. - inter_node1 = self.inter_node[self.inter_node.inter_type == 'parent'].drop('inter_type', axis=1) - inter_info1 = self.inter_info[['inter_no', 'inter_lat', 'inter_lon']] - inter = pd.merge(inter_node1, inter_info1, how='left', left_on=['inter_no'], - right_on=['inter_no']).drop_duplicates() - - self.inter2node = dict(zip(inter['inter_no'], inter['node_id'])) - self.match5 = self.match4.copy() # 진입진출ID 매칭 for index, row in self.match5.iterrows():