|
@ -171,7 +171,7 @@ class SignalGenerator(): |
|
|
self.history = pd.read_csv(os.path.join(self.path_tables, 'TL_IF_SIGL_CYCL.csv'), dtype=loading_dtype) |
|
|
self.history = pd.read_csv(os.path.join(self.path_tables, 'TL_IF_SIGL_CYCL.csv'), dtype=loading_dtype) |
|
|
self.inter_node = pd.read_csv(os.path.join(self.path_tables, 'inter_node.csv'), dtype=loading_dtype) |
|
|
self.inter_node = pd.read_csv(os.path.join(self.path_tables, 'inter_node.csv'), dtype=loading_dtype) |
|
|
self.matching = pd.read_csv(os.path.join(self.path_intermediates, 'matching.csv'), dtype=loading_dtype) |
|
|
self.matching = pd.read_csv(os.path.join(self.path_intermediates, 'matching.csv'), dtype=loading_dtype) |
|
|
self.match1 = pd.read_csv(os.path.join(self.path_intermediates, 'match1.csv'), dtype=loading_dtype) |
|
|
|
|
|
|
|
|
self.match1 = pd.read_csv(os.path.join(self.path_intermediates, 'match1.csv'), dtype=loading_dtype) |
|
|
self.match6 = pd.read_csv(os.path.join(self.path_intermediates, 'match6.csv'), dtype=loading_dtype) |
|
|
self.match6 = pd.read_csv(os.path.join(self.path_intermediates, 'match6.csv'), dtype=loading_dtype) |
|
|
|
|
|
|
|
|
# 신호이력 컬럼 변경 등 |
|
|
# 신호이력 컬럼 변경 등 |
|
@ -822,8 +822,8 @@ class SignalGenerator(): |
|
|
|
|
|
|
|
|
SIG = pd.merge(csig_A, csig_B, on=['start_time', 'start_unix'], how='outer') |
|
|
SIG = pd.merge(csig_A, csig_B, on=['start_time', 'start_unix'], how='outer') |
|
|
SIG = SIG.sort_values(by='start_time').reset_index(drop=True) |
|
|
SIG = SIG.sort_values(by='start_time').reset_index(drop=True) |
|
|
SIG[['phas_A', 'state_A']] = SIG[['phas_A', 'state_A']].fillna(method='ffill') |
|
|
|
|
|
SIG[['phas_B', 'state_B']] = SIG[['phas_B', 'state_B']].fillna(method='ffill') |
|
|
|
|
|
|
|
|
SIG[['phas_A', 'state_A']] = SIG[['phas_A', 'state_A']].ffill() |
|
|
|
|
|
SIG[['phas_B', 'state_B']] = SIG[['phas_B', 'state_B']].ffill() |
|
|
SIG['phase'] = SIG['phas_A'] + "_" + SIG['phas_B'] |
|
|
SIG['phase'] = SIG['phas_A'] + "_" + SIG['phas_B'] |
|
|
SIG['node_id'] = node_id |
|
|
SIG['node_id'] = node_id |
|
|
SIG = SIG[['node_id', 'start_unix', 'start_time', 'phase', 'state_A', 'state_B']] |
|
|
SIG = SIG[['node_id', 'start_unix', 'start_time', 'phase', 'state_A', 'state_B']] |
|
|