Commit a1aaee69 authored by Tong Li's avatar Tong Li

多线程优化

parent 4d0bfa78
...@@ -184,13 +184,13 @@ public class MachineCalculator { ...@@ -184,13 +184,13 @@ public class MachineCalculator {
CopyOnWriteArrayList<TimeSegment> timeSegments= findAvailableSegments(machine, currentTime, machineTasks, remainingTime, isInterrupt); CopyOnWriteArrayList<TimeSegment> timeSegments= findAvailableSegments(machine, currentTime, machineTasks, remainingTime, isInterrupt);
int estimateIndex= (int) Math.ceil(remainingTime / (double) ONE_DAY_MINUTES); int estimateIndex= (int) Math.ceil(remainingTime / (double) ONE_DAY_MINUTES);
List<TimeSegment> timeSegments1=null; CopyOnWriteArrayList<TimeSegment> timeSegments1=null;
// if(estimateIndex>10) if(estimateIndex>10)
// { {
// timeSegments1= getEnoughSegmentsByEstimateIndex(timeSegments,currentTime,remainingTime); timeSegments1= getEnoughSegmentsByEstimateIndex(timeSegments,currentTime,remainingTime);
// } }
// if(timeSegments1==null) { if(timeSegments1==null) {
int i = 0; int i = 0;
while (remainingTime > 0) { while (remainingTime > 0) {
TimeSegment shift = timeSegments.get(i); TimeSegment shift = timeSegments.get(i);
...@@ -203,20 +203,20 @@ public class MachineCalculator { ...@@ -203,20 +203,20 @@ public class MachineCalculator {
RemoveMachineAvailable(machine, time,shift); RemoveMachineAvailable(machine, time,shift);
i++; i++;
} }
// }else { }else {
// times= CaldScheduleResultDetail(timeSegments1,machine,st,remainingTime,oneTime); times= CaldScheduleResultDetail(timeSegments1,machine,st,remainingTime,oneTime);
// } }
return times; return times;
} }
private List<ScheduleResultDetail> CaldScheduleResultDetail(CopyOnWriteArrayList<TimeSegment> timeSegments,Machine machine,LocalDateTime st,int remainingTime,double oneTime) private CopyOnWriteArrayList<ScheduleResultDetail> CaldScheduleResultDetail(CopyOnWriteArrayList<TimeSegment> timeSegments,Machine machine,LocalDateTime st,int remainingTime,double oneTime)
{ {
int processable1 =(int)calculateTotalAvailableSecond(timeSegments, st); int processable1 =(int)calculateTotalAvailableSecond(timeSegments, st);
List<ScheduleResultDetail> times = new CopyOnWriteArrayList<>(); CopyOnWriteArrayList<ScheduleResultDetail> times = new CopyOnWriteArrayList<>();
TimeSegment shiftfrist= timeSegments.get(0); TimeSegment shiftfrist= timeSegments.get(0);
......
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