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

ItEr25S07CUAsignacionGrupoRecursosAPlanificacionItEr24S08: Refactoring the sharing algorithm

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-07 21:57:58 +02:00
parent 0ef3aceb55
commit 0e6b70eb76
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ShareDivision.java
View file

@ -76,20 +76,24 @@ public class ShareDivision {
return Collections.unmodifiableList(shares);
}
public ShareDivision plus(int increment) {
public ShareDivision plus(final int increase) {
int remainderIncrease = increase;
List<ShareWrapper> wrapped = ShareWrapper.wrap(shares);
Collections.sort(wrapped);
int i = 0;
while (i < wrapped.size()) {
FillingBucket bucket = findNextFillingBucket(wrapped, i, increment);
bucket.doTheDistribution();
increment = increment - bucket.getIncreaseDone();
assert increment >= 0;
if (increment == 0)
if (remainderIncrease == 0) {
break;
i++;
}
int nextBigger = findNextBigger(wrapped, i);
FillingBucket bucket = fillingBuckectFor(wrapped, nextBigger,
remainderIncrease);
bucket.doTheDistribution();
i = nextBigger;
remainderIncrease = remainderIncrease - bucket.getIncreaseDone();
assert remainderIncrease >= 0;
}
assert increment == 0 : "all is assigned";
assert remainderIncrease == 0 : "all is assigned";
return ShareDivision.create(fromWrappers(wrapped));
}
@ -134,17 +138,22 @@ public class ShareDivision {
}
}
private static FillingBucket findNextFillingBucket(
List<ShareWrapper> wrappers, int start, int remaining) {
private static int findNextBigger(List<ShareWrapper> wrappers, int start) {
ShareWrapper startWrapper = wrappers.get(start);
for (int i = start + 1; i < wrappers.size(); i++) {
ShareWrapper current = wrappers.get(i);
if (!startWrapper.haveSameHours(current)) {
return new FillingBucket(wrappers.subList(0, i), Math.min(
hoursNeededToBeEqual(wrappers, 0, i), remaining));
return i;
}
}
return new FillingBucket(wrappers, remaining);
return wrappers.size();
}
private static FillingBucket fillingBuckectFor(List<ShareWrapper> wrappers,
int end, int remaining) {
int hoursToDistribute = end == wrappers.size() ? remaining : Math.min(
hoursNeededToBeEqual(wrappers, 0, end), remaining);
return new FillingBucket(wrappers.subList(0, end), hoursToDistribute);
}
private static int hoursNeededToBeEqual(List<ShareWrapper> wrappers,