优化速度

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

@@ -328,14 +328,14 @@ 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.parallelStream().forEach(chromosome -> {
                     decode(decoder, chromosome, param, allOperations, globalOpList);
@@ -343,19 +343,20 @@ public class GeneticAlgorithm {
 
 
             }
+        }
 
     }
 
     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

@@ -379,13 +379,10 @@ if(finishedOrder==null||finishedOrder.size()==0)
 
 
 
-        FileHelper.writeLogFile("  开始    "+operation.getGroupId()+" : "+operation.getId()+",处理时间: " + processingTime + ", 后处理: " + teardownTime +
-                ", 前处理: " + preTime + ", 换型: " + setupTime+ ", 数量: " + operation.getQuantity()+ ", 设备: "+machine.getId()+ ", 是否可中断: "+operation.getIsInterrupt());
+//        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;