Merge branch 'master' of github.com:Allvey/integrated-scheduling

# Conflicts: # realtime_dispatch.py # settings.py # static_data_process.py # tables.py # traffic_flow_planner.py

Merge branch 'master' of github.com:Allvey/integrated-scheduling
51fdb99f · Allvey · 188ad10f · ce9ea011 · 51fdb99f · 51fdb99f
Commit 51fdb99f authored Aug 03, 2021 by Allvey
5 changed files
--- a/integrated-scheduling @ ce9ea011
+++ b/integrated-scheduling @ ce9ea011
-Subproject commit ce9ea0115c095fcf55affdae3c20281d8a00aec4
--- a/logs/dispatch.log
+++ b/logs/dispatch.log
--- a/realtime_dispatch.py
+++ b/realtime_dispatch.py
@@ -969,7 +969,7 @@ class Dispatcher(DeviceMap):
        unloading_time = self.dump.get_unloading_time()
        # 路网信息
        park_to_load_eq = self.walker.get_park_to_load_eq()
-        go_time_eq = self.walker.get_o_time_eq()
+        go_time_eq = self.walker.get_go_time_eq()
        com_time_eq = self.walker.get_com_time_eq()
        now = float((datetime.now() - self.start_time) / timedelta(hours=0, minutes=1, seconds=0))

--- a/traffic_flow_info.py
+++ b/traffic_flow_info.py
--- a/traffic_flow_planner.py
+++ b/traffic_flow_planner.py