Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
integrated-scheduling
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张晓彤
integrated-scheduling
Commits
b68d9546
Commit
b68d9546
authored
Nov 01, 2021
by
Allvey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
车流规划修复
parent
711d6723
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
4 deletions
+14
-4
dump.py
equipment/dump.py
+2
-1
para_config.py
para_config.py
+9
-1
path_plannner.py
path_plan/path_plannner.py
+1
-1
realtime_dispatch.py
realtime_dispatch.py
+0
-0
traffic_flow_info.py
traffic_flow/traffic_flow_info.py
+1
-1
traffic_flow_planner.py
traffic_flow/traffic_flow_planner.py
+1
-0
No files found.
equipment/dump.py
View file @
b68d9546
...
@@ -178,4 +178,4 @@ class DumpInfo(WalkManage):
...
@@ -178,4 +178,4 @@ class DumpInfo(WalkManage):
self
.
update_dump_priority
()
self
.
update_dump_priority
()
# 卸载目标产量
# 卸载目标产量
#
self.dump_target_mass = np.full(self.dynamic_dump_num, dump_target_mass)
self
.
dump_target_mass
=
np
.
full
(
self
.
dynamic_dump_num
,
dump_target_mass
)
\ No newline at end of file
para_config.py
View file @
b68d9546
...
@@ -335,6 +335,10 @@ class WalkManage(DeviceMap):
...
@@ -335,6 +335,10 @@ class WalkManage(DeviceMap):
# 计算设备路网距离及行走时间
# 计算设备路网距离及行走时间
try
:
try
:
logger
.
info
(
'dynamic_dump_num'
)
logger
.
info
(
dynamic_dump_num
)
logger
.
info
(
'dynamic_excavator_num'
)
logger
.
info
(
dynamic_excavator_num
)
for
i
in
range
(
dynamic_dump_num
):
for
i
in
range
(
dynamic_dump_num
):
for
j
in
range
(
dynamic_excavator_num
):
for
j
in
range
(
dynamic_excavator_num
):
self
.
distance_to_excavator
[
i
][
j
]
=
self
.
distance_to_load_area
[
self
.
distance_to_excavator
[
i
][
j
]
=
self
.
distance_to_load_area
[
...
@@ -350,10 +354,14 @@ class WalkManage(DeviceMap):
...
@@ -350,10 +354,14 @@ class WalkManage(DeviceMap):
self
.
dump_index_to_unload_area_index_dict
[
i
]
self
.
dump_index_to_unload_area_index_dict
[
i
]
][
self
.
excavator_index_to_load_area_index_dict
[
j
]]
][
self
.
excavator_index_to_load_area_index_dict
[
j
]]
except
Exception
as
es
:
except
Exception
as
es
:
logger
.
error
(
"设备路网信息异常
异常
"
)
logger
.
error
(
"设备路网信息异常"
)
logger
.
error
(
es
)
logger
.
error
(
es
)
try
:
try
:
logger
.
info
(
'load_area_uuid_to_index_dict'
)
logger
.
info
(
load_area_uuid_to_index_dict
)
logger
.
info
(
'park_uuid_to_index_dict'
)
logger
.
info
(
park_uuid_to_index_dict
)
for
item
in
session_postgre
.
query
(
WalkTimePark
)
.
all
():
for
item
in
session_postgre
.
query
(
WalkTimePark
)
.
all
():
load_area
=
str
(
item
.
load_area_id
)
load_area
=
str
(
item
.
load_area_id
)
park_area
=
str
(
item
.
park_area_id
)
park_area
=
str
(
item
.
park_area_id
)
...
...
path_plan/path_plannner.py
View file @
b68d9546
...
@@ -57,7 +57,7 @@ class PathPlanner(WalkManage):
...
@@ -57,7 +57,7 @@ class PathPlanner(WalkManage):
# 修正因子
# 修正因子
weight
=
60
weight
=
60
# 阻塞成本权重
# 阻塞成本权重
alpha
=
0
alpha
=
1
# 距离成本权重
# 距离成本权重
beta
=
1
beta
=
1
...
...
realtime_dispatch.py
View file @
b68d9546
This diff is collapsed.
Click to expand it.
traffic_flow/traffic_flow_info.py
View file @
b68d9546
...
@@ -115,6 +115,7 @@ class Traffic_para(WalkManage):
...
@@ -115,6 +115,7 @@ class Traffic_para(WalkManage):
# 设置挖机信息
# 设置挖机信息
def
extract_excavator_info
(
self
):
def
extract_excavator_info
(
self
):
try
:
try
:
rule4
=
session_mysql
.
query
(
DispatchRule
)
.
filter_by
(
id
=
4
)
.
first
()
rule4
=
session_mysql
.
query
(
DispatchRule
)
.
filter_by
(
id
=
4
)
.
first
()
if
not
rule4
.
disabled
:
if
not
rule4
.
disabled
:
...
@@ -129,7 +130,6 @@ class Traffic_para(WalkManage):
...
@@ -129,7 +130,6 @@ class Traffic_para(WalkManage):
else
:
else
:
self
.
excavator_strength
=
np
.
full
(
self
.
num_of_excavator
,
5000
)
self
.
excavator_strength
=
np
.
full
(
self
.
num_of_excavator
,
5000
)
for
excavator_index
in
range
(
len
(
self
.
excavator_index_to_uuid_dict
)):
for
excavator_index
in
range
(
len
(
self
.
excavator_index_to_uuid_dict
)):
# self.excavator_strength[excavator_index] = 1000 # 挖机最大装载能力,单位吨/小时
self
.
grade_loading_array
[
excavator_index
]
=
100
# 挖机装载物料品位
self
.
grade_loading_array
[
excavator_index
]
=
100
# 挖机装载物料品位
self
.
excavator_priority_coefficient
[
excavator_index
]
=
1
# 挖机优先级
self
.
excavator_priority_coefficient
[
excavator_index
]
=
1
# 挖机优先级
...
...
traffic_flow/traffic_flow_planner.py
View file @
b68d9546
...
@@ -170,6 +170,7 @@ def traffic_flow_plan():
...
@@ -170,6 +170,7 @@ def traffic_flow_plan():
walk_time_to_dump
=
traffic_programme_para
.
walk_time_to_dump
walk_time_to_dump
=
traffic_programme_para
.
walk_time_to_dump
truck_total_num
=
traffic_programme_para
.
truck_total_num
truck_total_num
=
traffic_programme_para
.
truck_total_num
print
(
w_ij
,
s_ij
,
b_excavator
,
b_dump
)
print
(
w_ij
,
s_ij
,
b_excavator
,
b_dump
)
res
=
transportation_problem_slove
(
coefficient_goto_dump
,
coefficient_goto_excavator
,
w_ij
,
s_ij
,
b_excavator
,
b_dump
,
res
=
transportation_problem_slove
(
coefficient_goto_dump
,
coefficient_goto_excavator
,
w_ij
,
s_ij
,
b_excavator
,
b_dump
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment