优化速度

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

@@ -327,36 +327,21 @@ public class GeneticAlgorithm {
     {
          FileHelper.writeLogFile("解码---------------"+population.size() );
 
-        GeneticDecoder decoder = new GeneticDecoder(_GlobalParam, param.getBaseTime(), machines, orders, materials, machineScheduler,orderMaterials);
+            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();
+        }
 
-        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 -> {
-                    chromosome.setResult(new ArrayList<>());
-
-                    // 假设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());
-                    //  _sceneService.saveChromosomeToFile(chromosome, "12345679");
-
-                    decoder.decodeChromosomeWithCache(chromosome);
-                    if (chromosome.getFitness() == 0) {
-                        chromosome.setFitness(_fitnessCalculator.calculateFitness(chromosome, _objectiveWeights));
-                    }
+                population.forEach(chromosome -> {
+                    decode(decoder, chromosome, param, allOperations, globalOpList);
                 });
-
-
             }
-        }
+        //}
     }
 
     private  void  decode(GeneticDecoder decoder,Chromosome chromosome,ScheduleParams param, List<Entry> allOperations,List<GlobalOperationInfo> globalOpList) {