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

ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Return extra information about the allocation instead of just a boolean

Browse source
This commit is contained in:
Óscar González Fernández 2010-06-27 14:40:07 +02:00
parent 9a423d0058
commit 01ecefbb39
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
View file

@ -384,16 +384,21 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
for (LimitingResourceQueueElement each : queuesState
.getInsertionsToBeDoneFor(externalQueueElement)) {
InsertionRequirements requirements = queuesState.getRequirementsFor(each);
boolean inserted = insertAtGap(requirements);
if (!inserted) {
AllocationAttempt allocationDone = insertAtGap(requirements);
if (allocationDone == null) {
break;
}
assert allocationDone.isValid();
result.add(requirements.getElement());
}
return result;
}
private boolean insertAtGap(InsertionRequirements requirements) {
/**
* @return <code>null</code> if no suitable gap found; the allocation found
* otherwise
*/
private AllocationAttempt insertAtGap(InsertionRequirements requirements) {
List<GapOnQueue> potentiallyValidGapsFor = queuesState
.getPotentiallyValidGapsFor(requirements);
boolean generic = requirements.getElement().isGeneric();
@ -404,11 +409,11 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
.guessValidity(eachSubGap);
if (allocation.isValid()) {
doAllocation(requirements, allocation, eachSubGap.getOriginQueue());
return true;
return allocation;
}
}
}
return false;
return null;
}
private List<GapOnQueue> getSubGaps(GapOnQueue each,