Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
integrated-scheduling-v3
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
1
Merge Requests
1
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-v3
Commits
9875a3db
Commit
9875a3db
authored
Oct 12, 2023
by
Allvey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
穿越装载区优化
parent
c6e1edd1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
config.json
config.json
+7
-2
group.py
core/group.py
+2
-2
No files found.
config.json
View file @
9875a3db
{
"para"
:
{
"log_path"
:
"/usr/local/fleet-log/dispatch"
,
"empty_speed"
:
80
,
"heavy_speed"
:
60
,
"empty_speed"
:
15
,
"heavy_speed"
:
15
,
"dump_target_mass"
:
5000
,
"excavator_target_mass"
:
5000
},
...
...
@@ -23,5 +23,9 @@
"redis"
:
{
"host"
:
"172.16.0.51"
,
"password"
:
"Huituo@123"
},
"gothrough"
:
{
"closer_area_name"
:
"1025装载区01"
,
"further_area_name"
:
"1025装载区-03"
}
}
\ No newline at end of file
core/group.py
View file @
9875a3db
...
...
@@ -1137,7 +1137,7 @@ class GoThroughDispatcher:
try
:
further_area_backtrack_node_id
=
self
.
further_entrance_node_id
self
.
further_area_backtrack_lanes
=
[]
for
i
in
range
(
5
):
for
i
in
range
(
20
):
# 查询回溯路段对象
item
=
session_postgre
.
query
(
Lane
)
.
filter_by
(
EndNodeId
=
further_area_backtrack_node_id
)
.
first
()
if
item
is
None
:
...
...
@@ -1191,7 +1191,7 @@ class GoThroughDispatcher:
# 多回溯一个路段
if
lowest_common_ancestor
.
Length
<
200
:
item
=
session_postgre
.
query
(
Lane
)
.
filter_by
(
EndNodeId
=
lowest_common_ancestor
.
StartNodeId
)
.
first
()
self
.
gothrough_check_lanes
.
append
(
item
.
Id
)
self
.
gothrough_check_lanes
.
append
(
str
(
item
.
Id
)
)
self
.
logger
.
info
(
"gothrough_check_lanes"
)
self
.
logger
.
info
(
self
.
gothrough_check_lanes
)
...
...
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