Skip to content

I
integrated-scheduling-v3
Commit cb0f6296 authored by 张晓彤's avatar 张晓彤
Browse files
Options

7-17更新

parent 4c78fd78
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 75 deletions
core/dispatcher.py
View file @ cb0f6296
...@@ -130,7 +130,7 @@ class DispatchSubmission: ...@@ -130,7 +130,7 @@ class DispatchSubmission:
group_id=group_id, group_id=group_id,
isdeleted=0, ).first()) isdeleted=0, ).first())
if item is None: if (item is None) or (dispatch_seq[0] is None):
raise Exception("调度计划表与实时监控不匹配") raise Exception("调度计划表与实时监控不匹配")
except Exception as es: except Exception as es:
self.logger.error(es) self.logger.error(es)
...@@ -168,7 +168,7 @@ class DispatchSubmission: ...@@ -168,7 +168,7 @@ class DispatchSubmission:
truck_id=truck_id, truck_id=truck_id,
group_id=group_id, group_id=group_id,
isdeleted=0, ).first()) isdeleted=0, ).first())
if item is None: if (item is None) or (dispatch_seq[0] is None):
raise Exception("调度计划表与实时监控不匹配") raise Exception("调度计划表与实时监控不匹配")
except Exception as es: except Exception as es:
self.logger.error(es) self.logger.error(es)
...@@ -205,7 +205,7 @@ class DispatchSubmission: ...@@ -205,7 +205,7 @@ class DispatchSubmission:
group_id=group_id, group_id=group_id,
isdeleted=0).first()) isdeleted=0).first())
if item is None: if (item is None) or (dispatch_seq[0] is None):
raise Exception("调度计划表与实时监控不匹配") raise Exception("调度计划表与实时监控不匹配")
# self.logger.info(dispatch_seq[1]) # self.logger.info(dispatch_seq[1])
...@@ -263,7 +263,6 @@ class DispatchSubmission: ...@@ -263,7 +263,6 @@ class DispatchSubmission:
:param dispatch_plan_dict: (Dict) :param dispatch_plan_dict: (Dict)
:return: None :return: None
""" """
aa = dispatch_plan_dict
for truck_id, dispatch_plan in dispatch_plan_dict.items(): for truck_id, dispatch_plan in dispatch_plan_dict.items():
self.logger.info(f'======================================= 调度车辆 =======================================') self.logger.info(f'======================================= 调度车辆 =======================================')
self.logger.info(f'矿车编号 {get_value("truck_uuid_to_name_dict")[truck_id]} {truck_id}') self.logger.info(f'矿车编号 {get_value("truck_uuid_to_name_dict")[truck_id]} {truck_id}')
......
core/group.py
View file @ cb0f6296
...@@ -187,7 +187,6 @@ class Group: ...@@ -187,7 +187,6 @@ class Group:
assert issubclass(solver, AlgorithmBase) assert issubclass(solver, AlgorithmBase)
s = solver(self, self.truck, self.pre_sch) # algorithm init s = solver(self, self.truck, self.pre_sch) # algorithm init
aa = self.truck_set
for i in list(self.truck_set): for i in list(self.truck_set):
truck_trip = self.truck.get_truck_current_trip()[self.truck_uuid_index_dict[i]] truck_trip = self.truck.get_truck_current_trip()[self.truck_uuid_index_dict[i]]
truck_task = self.truck.get_truck_current_task()[i] truck_task = self.truck.get_truck_current_task()[i]
...@@ -195,7 +194,7 @@ class Group: ...@@ -195,7 +194,7 @@ class Group:
self.truck_info_list[i] = truck_info self.truck_info_list[i] = truck_info
# 全智能模式 # 全智能模式
if self.group_mode == 1: if self.group_mode == 1:
if truck_task in [-2, 2,3, 4]: if truck_task in [-2, 2, 3, 4]:
try: try:
next_excavator_value = s.solve(truck_info) next_excavator_value = s.solve(truck_info)
...@@ -216,7 +215,6 @@ class Group: ...@@ -216,7 +215,6 @@ class Group:
if truck_task in [0, 1, 5]: if truck_task in [0, 1, 5]:
try: try:
bb = truck_task
next_unload_area_value = s.solve(truck_info) next_unload_area_value = s.solve(truck_info)
min_index = np.argmin(next_unload_area_value) min_index = np.argmin(next_unload_area_value)
next_unload_area_id = self.unload_area_uuid_index_dict.inverse[min_index] next_unload_area_id = self.unload_area_uuid_index_dict.inverse[min_index]
...@@ -226,9 +224,10 @@ class Group: ...@@ -226,9 +224,10 @@ class Group:
except Exception as es: except Exception as es:
self.logger.error("空载车辆全智能模式-计算异常") self.logger.error("空载车辆全智能模式-计算异常")
self.logger.error(es) self.logger.error(es)
truck_dispatch[i] = [None, None]
# 空车智能模式 # 空车智能模式
elif self.group_mode == 2: elif self.group_mode == 2:
if truck_task in [-2, 2,3, 4]: if truck_task in [-2, 2, 3, 4]:
try: try:
next_excavator_value = s.solve(truck_info) next_excavator_value = s.solve(truck_info)
...@@ -262,72 +261,5 @@ class Group: ...@@ -262,72 +261,5 @@ class Group:
elif self.group_mode == 4: elif self.group_mode == 4:
pass pass
# try:
# # 全智能模式
# if self.group_mode == 1:
# assert issubclass(solver, AlgorithmBase)
# s = solver(self, self.truck, self.pre_sch) # algorithm init
#
# for i in list(self.truck_set):
# truck_trip = self.truck.get_truck_current_trip()[self.truck_uuid_index_dict[i]]
# truck_task = self.truck.get_truck_current_task()[i]
# truck_info = CurrentTruck(i, self.group_id, truck_trip, truck_task)
# # a = truck_info._truck_id
# # b = truck_info._trip
# # c = truck_info._task
# # d = truck_info._group_id
# if truck_task in [-2, 2,3, 4]:
#
# next_excavator_value = s.solve(truck_info)
# # next_excavator_value = s.solve(i, truck_task, truck_trip)
# # min_index = next_excavator_list.index(min(next_excavator_list))
# min_index = np.argmin(next_excavator_value)
# next_excavator_id = self.excavator_uuid_index_dict.inverse[min_index]
# if truck_task == -2:
# next_unload_area_id = "Park"
# else:
# next_unload_area_id = self.unload_area_uuid_index_dict.inverse[truck_trip[-1]]
# truck_dispatch[i] = [next_excavator_id, next_unload_area_id]
#
# if truck_task in [0, 1, 5]:
# bb = truck_task
# next_unload_area_value = s.solve(truck_info)
# min_index = np.argmin(next_unload_area_value)
# next_unload_area_id = self.unload_area_uuid_index_dict.inverse[min_index]
# next_excavator_id = self.excavator_uuid_index_dict.inverse[truck_trip[-1]]
# truck_dispatch[i] = [next_excavator_id, next_unload_area_id]
# # 空车智能模式
# elif self.group_mode == 2:
# assert issubclass(solver, AlgorithmBase)
# s = solver(self, self.truck, self.pre_sch) # algorithm init
#
# for i in list(self.truck_set):
# truck_trip = self.truck.get_truck_current_trip()[self.truck_uuid_index_dict[i]]
# truck_task = self.truck.get_truck_current_task()[i]
# truck_info = CurrentTruck(i, self.group_id, truck_trip, truck_task)
# if truck_task in [-2, 2,3, 4]:
# next_excavator_value = s.solve(truck_info)
# # min_index = next_excavator_list.index(min(next_excavator_list))
# min_index = np.argmin(next_excavator_value)
# next_excavator_id = self.excavator_uuid_index_dict.inverse[min_index]
# if truck_task == -2:
# next_unload_area_id = "Park"
# else:
# next_unload_area_id = self.unload_area_uuid_index_dict.inverse[truck_trip[-1]]
# truck_dispatch[i] = [next_excavator_id, next_unload_area_id]
# if truck_task in [0, 1, 5]:
# truck_dispatch[i] = DispatchInfo.get_truck_match(i)
# # 定铲派车
# elif self.group_mode == 3:
# for i in list(self.truck_set):
# truck_dispatch[i] = DispatchInfo.get_truck_match(i)
#
# elif self.group_mode == 4:
# pass
# except Exception as es:
# self.logger.error("group调度出错")
# self.logger.error(es)
# return dispatch plan # return dispatch plan
return truck_dispatch return truck_dispatch
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