Commit 60970636 authored by Tong Li's avatar Tong Li

AI模型

parent a275b550
...@@ -694,6 +694,10 @@ public class GeneticDecoder { ...@@ -694,6 +694,10 @@ public class GeneticDecoder {
for (int groupId : chromosome.getOperationSequencing()) { for (int groupId : chromosome.getOperationSequencing()) {
int scheduledCount = orderProcessCounter.get(groupId); int scheduledCount = orderProcessCounter.get(groupId);
if(groupId==1)
{
int i=0;
}
List<Entry> orderOps=new ArrayList<>(); List<Entry> orderOps=new ArrayList<>();
...@@ -2398,7 +2402,7 @@ if(geneDetails!=null&&geneDetails.size()>0) ...@@ -2398,7 +2402,7 @@ if(geneDetails!=null&&geneDetails.size()>0)
} }
//重叠 //重叠
List<OperationDependency> SSOperations = currentOp.getPrevEntryIds().stream() List<OperationDependency> SSOperations = currentOp.getPrevEntryIds().stream()
.filter(t -> t.getDependencyType() == DependencyType.StartToStart) .filter(t -> t.getDependencyType() == DependencyType.Overlapping)
.collect(Collectors.toList());//重叠 .collect(Collectors.toList());//重叠
if (SSOperations != null && SSOperations.size() > 0) { if (SSOperations != null && SSOperations.size() > 0) {
List<GAScheduleResult> newScheduleResult = new ArrayList<>(); List<GAScheduleResult> newScheduleResult = new ArrayList<>();
......
...@@ -53,16 +53,15 @@ public class GeneticDecoderBom { ...@@ -53,16 +53,15 @@ public class GeneticDecoderBom {
|| lastOp.getTargetFinishedOperationId().isEmpty()) break; || lastOp.getTargetFinishedOperationId().isEmpty()) break;
int targetOpId = lastOp.getTargetFinishedOperationId().get(0); int targetOpId = lastOp.getTargetFinishedOperationId().get(0);
int targetGroupId = findGroupForOperation(targetOpId, entrysBygroupId); int targetGroupId = findGroupForOperation(targetOpId, entrysBygroupId);
Entry targetOp= entryIndexById.get(targetOpId);
List<Integer> simGroupId=targetOp.getDependentOnOrderIds();
if (targetGroupId < 0) break; if (targetGroupId < 0) break;
List<Entry> targetOps = entrysBygroupId.get(targetGroupId); List<Entry> targetOps = entrysBygroupId.get(targetGroupId);
if (targetOps == null || targetOps.isEmpty()) break; if (targetOps == null || targetOps.isEmpty()) break;
Entry firstTargetOp = targetOps.get(0); Entry firstTargetOp = targetOps.get(0);
if (Entry.SchedulingMode.FORWARD.name().equals( if (Entry.SchedulingMode.FORWARD.name().equals(
firstTargetOp.getSchedulingMode())) { firstTargetOp.getSchedulingMode())) {
if(targetGroupId==3)
{
int i=0;
}
int rootStart = forwardEstimateToOperation(decoder,targetOpId, targetGroupId,0, int rootStart = forwardEstimateToOperation(decoder,targetOpId, targetGroupId,0,
entrysBygroupId, opMachineKeyMap, chromosome, entrysBygroupId, opMachineKeyMap, chromosome,
scheduleIndexById, machineTasksCache,machineIdMap,entryIndexById,false); scheduleIndexById, machineTasksCache,machineIdMap,entryIndexById,false);
......
...@@ -43,7 +43,10 @@ public class PlanResultServiceTest { ...@@ -43,7 +43,10 @@ public class PlanResultServiceTest {
// planResultService.execute2("64E64F6B68094AF38CEDC418630C3CC2");//2000 // planResultService.execute2("64E64F6B68094AF38CEDC418630C3CC2");//2000
// planResultService.execute2("E1448B3C9C8743DEAB39708F2CFE348A");//倒排bomces // planResultService.execute2("E1448B3C9C8743DEAB39708F2CFE348A");//倒排bomces
planResultService.execute2("85DA28EC5F4643449E65A51253D5F127"); // planResultService.execute2("85DA28EC5F4643449E65A51253D5F127"); //bom 多半成品
planResultService.execute2("FB14AF1623CB461D9BEDAFC35DBF0AFC"); //重叠
// planResultService.execute2("F8F147BD627C47B1A190399DD7A697F6"); // planResultService.execute2("F8F147BD627C47B1A190399DD7A697F6");
// planResultService.execute2("9FEDFD92BB6A4675BF9B1CC64505D1AB"); // planResultService.execute2("9FEDFD92BB6A4675BF9B1CC64505D1AB");
......
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