优化速度

src/main/java/com/aps/service/Algorithm/GeneticAlgorithm.java

@@ -328,32 +328,32 @@ public class GeneticAlgorithm {
          FileHelper.writeLogFile("解码---------------"+population.size() );
 
             GeneticDecoder decoder = new GeneticDecoder(_GlobalParam, param.getBaseTime(), machines, orders, materials, machineScheduler, orderMaterials);
-        if(1==2) {
+
             CompletableFuture.allOf(population.stream()
                             .map(chromosome -> CompletableFuture.runAsync(() -> decode(decoder, chromosome, param, allOperations, globalOpList), decodeExecutor))
                             .toArray(CompletableFuture[]::new))
                     .join();
-        }
 
 
+        if(1==2) {
             if (population != null && population.size() > 0) {
                 population.forEach(chromosome -> {
                     decode(decoder, chromosome, param, allOperations, globalOpList);
                 });
             }
-        //}
+        }
     }
 
     private  void  decode(GeneticDecoder decoder,Chromosome chromosome,ScheduleParams param, List<Entry> allOperations,List<GlobalOperationInfo> globalOpList) {
         chromosome.setResult(new ArrayList<>());
-        _sceneService.saveChromosomeToFile(chromosome, "12345679");
+
         // 假设Machine类有拷贝方法，或使用MapStruct等工具进行映射
-        //  chromosome.setInitMachines(ProductionDeepCopyUtil.deepCopyList(machines)); // 简单拷贝，实际可能需要深拷贝
          chromosome.setMachines(ProductionDeepCopyUtil.deepCopyList(machines,Machine.class)); // 简单拷贝，实际可能需要深拷贝
         chromosome.setAllOperations(allOperations); // 简单拷贝，实际可能需要深拷贝
         chromosome.setGlobalOpList(globalOpList); // 简单拷贝，实际可能需要深拷贝
         //chromosome.setObjectiveWeights(_objectiveWeights);
         chromosome.setBaseTime(param.getBaseTime());
+       // chromosome.setInitMachines(ProductionDeepCopyUtil.deepCopyList(machines)); // 简单拷贝，实际可能需要深拷贝
        // _sceneService.saveChromosomeToFile(chromosome, "12345679");
 
         decoder.decodeChromosomeWithCache(chromosome);

src/main/java/com/aps/service/Algorithm/GeneticDecoder.java

@@ -382,7 +382,10 @@ if(finishedOrder==null||finishedOrder.size()==0)
 //        FileHelper.writeLogFile("  开始    "+operation.getGroupId()+" : "+operation.getId()+",处理时间: " + processingTime + ", 后处理: " + teardownTime +
 //                ", 前处理: " + preTime + ", 换型: " + setupTime+ ", 数量: " + operation.getQuantity()+ ", 设备: "+machine.getId()+ ", 是否可中断: "+operation.getIsInterrupt());
 
-
+if(operation.getId()==69)
+{
+    int i=0;
+}
         // 确定任务的最早开始时间（基于前一道工序的完整结束时间，包含后处理）
         int earliestStartTime = prevOperationEndTime;
 

src/main/java/com/aps/service/Algorithm/MachineCalculator.java

@@ -987,7 +987,7 @@ public class MachineCalculator {
             LocalDateTime geneEndTime = baseTime.plusSeconds(geneDetails.getEndTime());
         TimeSegment usedSegment = null;
             if (targetSegment.getEnd().isAfter(geneEndTime)) {
-
+                usedSegment=new TimeSegment();
                 usedSegment.setStart(baseTime.plusSeconds(geneDetails.getStartTime()));
                 usedSegment.setEnd(geneEndTime);
                 usedSegment.setHoliday(false);

src/test/java/com/aps/demo/PlanResultServiceTest.java

@@ -39,9 +39,9 @@ public class PlanResultServiceTest {
        // nsgaiiUtils.Test();
         //planResultService.execute2("C5FB5EF2A7334A0A92F826F4937E1008");
        //  planResultService.execute2("726D4C1A712B4B1393175BD44B775B66");
-       planResultService.execute2("BCA6FA43FFA444D3952CF8F6E1EA291B");
+       planResultService.execute2("E81EE93EFA564CEB8594C61CAEEBCD53");
 //        LocalDateTime t=   LocalDateTime.of(2025, 11, 15, 6, 51, 11);
-//       List<Integer> opids=new ArrayList<>();
+//       List<Integer> opids=new ArrayList<>();BCA6FA43FFA444D3952CF8F6E1EA291B
 //        opids.add(1);
 //        planResultService.Move("B571EF6682DB463AB2977B1055A74112",opids,t,3403L);
        // planResultService.Redecode("12345679");