Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HYH.APSJ
Project
Project
Details
Activity
Releases
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
佟礼
HYH.APSJ
Commits
587dadb1
Commit
587dadb1
authored
Apr 17, 2026
by
Tong Li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
6fefd6ad
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
11 deletions
+17
-11
GeneticDecoder.java
src/main/java/com/aps/service/Algorithm/GeneticDecoder.java
+2
-1
HybridAlgorithm.java
src/main/java/com/aps/service/Algorithm/HybridAlgorithm.java
+1
-1
VariableNeighborhoodSearch.java
...com/aps/service/Algorithm/VariableNeighborhoodSearch.java
+13
-8
PlanResultServiceTest.java
src/test/java/com/aps/demo/PlanResultServiceTest.java
+1
-1
No files found.
src/main/java/com/aps/service/Algorithm/GeneticDecoder.java
View file @
587dadb1
...
...
@@ -58,7 +58,7 @@ public class GeneticDecoder {
private
DiscreteParameterMatrixService
discreteParameterMatrixService
;
private
String
sceneId
;
private
boolean
rebuildStructureForCurrentDecode
=
fals
e
;
private
boolean
rebuildStructureForCurrentDecode
=
tru
e
;
...
...
@@ -405,6 +405,7 @@ public class GeneticDecoder {
chromosome
.
setScenarioID
(
sceneId
);
if
(
rebuildStructureForCurrentDecode
)
{
//创建半成品订单
materialRequirementService
.
buildMultiLevelRequirementNetwork
(
chromosome
,
sceneId
,
baseTime
,
_globalParam
);
}
...
...
src/main/java/com/aps/service/Algorithm/HybridAlgorithm.java
View file @
587dadb1
...
...
@@ -456,7 +456,7 @@ int opcount=allOperations.size();
FileHelper
.
writeLogFile
(
"解码---------------"
+
population
.
size
()
);
GeneticDecoder
decoder
=
new
GeneticDecoder
(
_GlobalParam
,
param
.
getBaseTime
(),
machines
,
orders
,
materials
,
machineScheduler
,
materialRequirementService
,
sceneId
);
boolean
ismore
=
tru
e
;
boolean
ismore
=
fals
e
;
if
(
ismore
)
{
CompletableFuture
.
allOf
(
population
.
stream
()
.
map
(
chromosome
->
CompletableFuture
.
runAsync
(()
->
decode
(
decoder
,
chromosome
,
param
,
allOperations
,
globalOpList
),
decodeExecutor
))
...
...
src/main/java/com/aps/service/Algorithm/VariableNeighborhoodSearch.java
View file @
587dadb1
...
...
@@ -1700,7 +1700,7 @@ public class VariableNeighborhoodSearch {
private
Chromosome
generateReverseNeighbor
(
Chromosome
chromosome
,
Map
<
Integer
,
Entry
>
positionIndex
,
List
<
List
<
Integer
>>
positionByPriority
)
{
Chromosome
neighbor
=
copyChromosome
(
chromosome
);
//ProductionDeepCopyUtil.deepCopy(chromosome, Chromosome.class);
List
<
Integer
>
os
=
neighbor
.
getOperationSequencing
();
if
(
os
.
size
()
>=
2
)
{
if
(
os
.
size
()
>=
2
&&
positionByPriority
.
size
()>
0
)
{
// Map<Integer, Entry> positionIndex = buildPositionToEntryIndex(neighbor);
int
maxAttempts
=
50
;
...
...
@@ -1771,7 +1771,7 @@ public class VariableNeighborhoodSearch {
private
Chromosome
generateInsertNeighbor
(
Chromosome
chromosome
,
Map
<
Integer
,
Entry
>
positionIndex
,
List
<
List
<
Integer
>>
positionByPriority
)
{
Chromosome
neighbor
=
copyChromosome
(
chromosome
);
// ProductionDeepCopyUtil.deepCopy(chromosome, Chromosome.class);
List
<
Integer
>
os
=
neighbor
.
getOperationSequencing
();
if
(
os
.
size
()
>=
2
)
{
if
(
os
.
size
()
>=
2
&&
positionByPriority
.
size
()>
0
)
{
// Map<Integer, Entry> positionIndex = buildPositionToEntryIndex(neighbor);
int
maxAttempts
=
50
;
...
...
@@ -2167,15 +2167,20 @@ public class VariableNeighborhoodSearch {
}
groupidByPriority
.
entrySet
().
removeIf
(
entry
->
entry
.
getValue
().
size
()
==
1
);
// if(groupidByPriority.size()!=0)
// {
indexByPriorityMap
.
keySet
().
removeIf
(
key
->
!
groupidByPriority
.
containsKey
(
key
));
indexByPriorityMap
.
keySet
().
removeIf
(
key
->
!
groupidByPriority
.
containsKey
(
key
));
//}
List
<
Map
.
Entry
<
Double
,
List
<
Integer
>>>
sortedEntries
=
new
ArrayList
<>(
indexByPriorityMap
.
entrySet
());
sortedEntries
.
sort
((
e1
,
e2
)
->
{
int
size1
=
groupidByPriority
.
get
(
e1
.
getKey
()).
size
();
int
size2
=
groupidByPriority
.
get
(
e2
.
getKey
()).
size
();
return
Integer
.
compare
(
size2
,
size1
);
// 降序:订单数多的排前面
});
// if(groupidByPriority.size()!=0) {
sortedEntries
.
sort
((
e1
,
e2
)
->
{
int
size1
=
groupidByPriority
.
get
(
e1
.
getKey
()).
size
();
int
size2
=
groupidByPriority
.
get
(
e2
.
getKey
()).
size
();
return
Integer
.
compare
(
size2
,
size1
);
// 降序:订单数多的排前面
});
// }
List
<
List
<
Integer
>>
indexByPriority
=
new
ArrayList
<>();
for
(
Map
.
Entry
<
Double
,
List
<
Integer
>>
entry
:
sortedEntries
)
{
...
...
src/test/java/com/aps/demo/PlanResultServiceTest.java
View file @
587dadb1
...
...
@@ -42,7 +42,7 @@ public class PlanResultServiceTest {
// planResultService.execute2("E29F2B3ADA8149F6B916B5119296A92B");//2000
planResultService
.
execute2
(
"E2CD1FC6FF9B4B19A59FEC7F846D4952"
);
//600
// planResultService.execute2("EAA0E2D70BC94EEDA2E5A4597BE69523");//bom
// planResultService.execute2("08B1D87FE1B84ECDBAC2E546DDB6FB81");//2000
// planResultService.execute2("0428340BB4F540938F1FB5599F03E8A4");//5000
// planResultService.execute2("C8B533BD8944405B9A2F8823C575C204");//500
...
...
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