Commit 02bc7591 authored by Allvey's avatar Allvey

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
parent 51fdb99f
123123123
\ No newline at end of file
[0802/170521.970:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
[0802/172459.125:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
......@@ -10,25 +10,7 @@
# 实时调度模块
from sqlalchemy import Column, create_engine
from sqlalchemy import VARCHAR, DateTime, Float, Integer, BOOLEAN
from sqlalchemy.orm import sessionmaker
from sqlalchemy.ext.declarative import declarative_base
import numpy as np
from redis import StrictRedis, ConnectionPool
import redis
from datetime import datetime, timedelta
import copy
import json
import sched
import time
from tables import *
from urllib.parse import quote
import logging
import logging.handlers
import os
from traffic_flow_planner import *
from settings import *
from traffic_flow.traffic_flow_planner import *
from static_data_process import *
# 全局参数设定
......
......@@ -7,9 +7,8 @@
# @Software: PyCharm
# import
import numpy as np
import pulp
from traffic_flow_info import *
from traffic_flow.traffic_flow_info import *
# from backstore_traffic_flow_info import *
# import time
# start = time.time()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment