RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid O(n2) algorithm

Browse source 
Removing already present using algorithm with linear complexity.

FEA: ItEr74S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-05-11 19:56:19 +02:00
parent 7d98e4a4c4
commit a553aade8c
1 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -1211,40 +1211,15 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
private void updateAssignments(AllocationInterval interval,
List<T> assignmentsCreated) {
/*
* removes assignments except those that are consolidated
*/
removingAssignments(withoutConsolidated(interval
.getAssignmentsOnInterval()));
/*
* add the assignments except those that already are consolidated. At
* this moment all the assignments in the interval are consolidated. So
* that it removes the created assignments that have got same date and
* therefore are already added.
*/
addingAssignments(subtractAssignmentsWithSameDate(assignmentsCreated,
interval.getAssignmentsOnInterval()));
addingAssignments(assignmentsCreated);
updateConsolidatedAssignments(interval);
updateOriginalTotalAssigment();
updateResourcesPerDay();
}
private Collection<? extends T> subtractAssignmentsWithSameDate(
List<T> assignmentsCreated,
List<DayAssignment> assignmentsOnInterval) {
List<T> toRemove = new ArrayList<T>();
for (DayAssignment each : assignmentsOnInterval) {
for (T assignment : assignmentsCreated) {
if (each.getDay().compareTo(assignment.getDay()) == 0) {
toRemove.add(assignment);
}
}
}
assignmentsCreated.removeAll(toRemove);
return assignmentsCreated;
}
private void updateConsolidatedAssignments(AllocationInterval interval) {
for (DayAssignment day : interval.getAssignmentsOnInterval()) {
day.setConsolidated(false);
@ -1284,7 +1259,30 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
}
protected final void addingAssignments(Collection<? extends T> assignments) {
getDayAssignmentsState().addingAssignments(assignments);
getDayAssignmentsState().addingAssignments(
withoutAlreadyPresent(assignments));
}
private List<? extends T> withoutAlreadyPresent(
Collection<? extends T> assignments) {
if(assignments.isEmpty()){
return Collections.emptyList();
}
LocalDate min = Collections.min(assignments,
DayAssignment.byDayComparator()).getDay();
LocalDate max = Collections.max(assignments,
DayAssignment.byDayComparator()).getDay();
Set<LocalDate> daysPresent = DayAssignment.byDay(
getAssignments(min, max.plusDays(1))).keySet();
List<T> result = new ArrayList<T>();
for (T each : assignments) {
if (!daysPresent.contains(each.getDay())) {
result.add(each);
}
}
return result;
}
public void removeLimitingDayAssignments() {