solve conflict

.idea/integrated-scheduling-v3.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
+<<<<<<< HEAD
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="jdk" jdkName="Python 3.7 (diapatch) (2)" jdkType="Python SDK" />
+=======
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.7 (waytous)" jdkType="Python SDK" />
+>>>>>>> bdb62c7 (增加等待时间算法-修复部分BUG)
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file

config.json

 {
     "para": {
-<<<<<<< HEAD
 
        "log_path":  "/Users/guoao/Desktop/work_log/wek33/integrated-scheduling-v3-master/dispatch",
-=======
-        "log_path": "E:\\Pycharm Projects\\Waytous\\",
->>>>>>> 4905484 (添加等待时间算法，修复部分BUG)
         "empty_speed": 25,
         "heavy_speed": 22,
         "dump_target_mass": 5000,

group_control/group_control.py

@@ -427,11 +427,6 @@ class Group(WalkManage):
         self.update_device_group()
         self.update_group_device_map()
         self.update_group_walk_cost()
-<<<<<<< HEAD
-        self.update_group_truck_flow(topo)
-=======
-        # self.update_group_truck_flow()
->>>>>>> 4905484 (添加等待时间算法，修复部分BUG)
         self.update_modify()
 
     def get_diaptch_truck_group(self):

realtime_dispatch.py

@@ -21,16 +21,9 @@ from dispatcher import Dispatcher, PreSchedule
 def process(dispatcher):
 
     # try:
-<<<<<<< HEAD
     # 更新周期参数
     logger.info("#####################################周期更新开始#####################################")
 
-    period_para_update()
-=======
-    # 更新周期参数
-    logger.info("#####################################周期更新开始#####################################")
-
->>>>>>> 4905484 (添加等待时间算法，修复部分BUG)
     if get_value("dynamic_dump_num") * get_value("dynamic_excavator_num") == 0:
         raise Exception("无动态派车计划可用")
         return
@@ -47,11 +40,7 @@ def process(dispatcher):
     session_postgre.flush()
 
     # 周期更新
-<<<<<<< HEAD
-    dispatcher.dispatcher_period_update(topo)
-=======
     dispatcher.dispatcher_period_update()
->>>>>>> 4905484 (添加等待时间算法，修复部分BUG)
 
     # try:
 

settings.py

@@ -47,41 +47,6 @@ dump_target_mass = para_config["dump_target_mass"]
 # 挖机目标装载量
 excavator_target_mass = para_config["excavator_target_mass"]
 
-
-<<<<<<< HEAD
-# def set_log():
-#
-#     # 创建日志
-#     ########################################################################################################################
-#     # 日志存储地址
-#     log_path = para_config["log_path"]
-#
-#     # 创建日志目录
-#
-#     if not os.path.exists(log_path):
-#         os.mkdir(log_path)
-#     # logging初始化工作
-#     logging.basicConfig()
-#
-#     logger = logging.getLogger("zxt")
-#     logger.setLevel(logging.INFO)
-#
-#
-#     # timefilehandler = logging.handlers.TimedRotatingFileHandler(log_path + "/dispatch.log", when='M', interval=1, backupCount=60)
-#     filehandler = logging.handlers.RotatingFileHandler(log_path + "/dispatch.log", maxBytes=3*1024*1024, backupCount=10)
-#     # filehandler = logging.handlers.RotatingFileHandler("./Logs/dispatch.log", maxBytes=3 * 1024 * 1024, backupCount=10)
-#     # 设置后缀名称，跟strftime的格式一样
-#     filehandler.suffix = "%Y-%m-%d_%H-%M.log"
-#
-#     formatter = logging.Formatter("%(asctime)s - %(name)s: %(levelname)s %(filename)s %(message)s")
-#     filehandler.setFormatter(formatter)
-#     logger.addHandler(filehandler)
-#
-#
-# def get_logger(module_name):
-#     logger = logging.getLogger(module_name)
-#     return logger
-=======
 def set_log():
 
     # 创建日志
@@ -114,7 +79,6 @@ def set_log():
 def get_logger(module_name):
     logger = logging.getLogger(module_name)
     return logger
->>>>>>> 4905484 (添加等待时间算法，修复部分BUG)
 
 
 # 连接reids

tables.py

@@ -39,52 +39,6 @@ with open(json_file) as f:
 with open(json_file) as f:
     postgre_config = json.load(f)["postgresql"]
 
-<<<<<<< HEAD
-with open(json_file) as f:
-    redis_config = json.load(f)["redis"]
-
-def set_log():
-
-    # 创建日志
-    ########################################################################################################################
-    # 日志存储地址
-    log_path = para_config["log_path"]
-
-    # 创建日志目录
-
-    if not os.path.exists(log_path):
-        os.mkdir(log_path)
-    # logging初始化工作
-    logging.basicConfig()
-
-    logger = logging.getLogger("zxt")
-    logger.setLevel(logging.INFO)
-
-
-    # timefilehandler = logging.handlers.TimedRotatingFileHandler(log_path + "/dispatch.log", when='M', interval=1, backupCount=60)
-    filehandler = logging.handlers.RotatingFileHandler(log_path + "/dispatch.log", maxBytes=3*1024*1024, backupCount=10)
-    # filehandler = logging.handlers.RotatingFileHandler("./Logs/dispatch.log", maxBytes=3 * 1024 * 1024, backupCount=10)
-    # 设置后缀名称，跟strftime的格式一样
-    filehandler.suffix = "%Y-%m-%d_%H-%M.log"
-
-    formatter = logging.Formatter("%(asctime)s - %(name)s: %(levelname)s %(filename)s %(message)s")
-    filehandler.setFormatter(formatter)
-    logger.addHandler(filehandler)
-
-
-def get_logger(module_name):
-    logger = logging.getLogger(module_name)
-    return logger
-
-json_file = "config.json"
-
-
-
-logger = get_logger("zxt.tables")
-=======
-# logger = get_logger("zxt.tables")
->>>>>>> 4905484 (添加等待时间算法，修复部分BUG)
-
 # # 创建对象的基类:
 # Base = declarative_base()
 #