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

Move method closer to call site

Browse source 
It's also made private since it's no longer used in other places.

FEA: ItEr70S09FragmentationDeletion
This commit is contained in:
Óscar González Fernández 2011-02-16 19:42:21 +01:00
parent 04ae798d48
commit 226f37d1d8
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/EffortDistributor.java
View file

@ -172,6 +172,31 @@ public class EffortDistributor {
ResourceWithDerivedData.resources(resourcesAssignable));
}
private List<ShareSource> divisionAt(
List<ResourceWithDerivedData> resources, LocalDate day) {
List<ShareSource> result = new ArrayList<ShareSource>();
for (int i = 0; i < resources.size(); i++) {
List<Share> shares = new ArrayList<Share>();
Resource resource = resources.get(i).resource;
ICalendar calendarForResource = resources.get(i).calendar;
EffortDuration alreadyAssigned = assignedHoursForResource
.getAssignedDurationAt(resource, day);
final int alreadyAssignedSeconds = alreadyAssigned.getSeconds();
Integer capacityEachOneSeconds = calendarForResource.asDurationOn(
PartialDay.wholeDay(day), ONE).getSeconds();
final int capacityUnits = resources.get(i).capacityUnits;
assert capacityUnits >= 1;
final int assignedForEach = alreadyAssignedSeconds / capacityUnits;
final int remainder = alreadyAssignedSeconds % capacityUnits;
for (int j = 0; j < capacityUnits; j++) {
int assignedSeconds = assignedForEach + (j < remainder ? 1 : 0);
shares.add(new Share(assignedSeconds - capacityEachOneSeconds));
}
result.add(new ShareSource(shares));
}
return result;
}
private List<ResourceWithDerivedData> resourcesAssignableAt(LocalDate day) {
List<ResourceWithDerivedData> result = new ArrayList<ResourceWithDerivedData>();
for (ResourceWithDerivedData each : resources) {
@ -229,29 +254,4 @@ public class EffortDistributor {
}
public List<ShareSource> divisionAt(
List<ResourceWithDerivedData> resources, LocalDate day) {
List<ShareSource> result = new ArrayList<ShareSource>();
for (int i = 0; i < resources.size(); i++) {
List<Share> shares = new ArrayList<Share>();
Resource resource = resources.get(i).resource;
ICalendar calendarForResource = resources.get(i).calendar;
EffortDuration alreadyAssigned = assignedHoursForResource
.getAssignedDurationAt(resource, day);
final int alreadyAssignedSeconds = alreadyAssigned.getSeconds();
Integer capacityEachOneSeconds = calendarForResource.asDurationOn(
PartialDay.wholeDay(day), ONE).getSeconds();
final int capacityUnits = resources.get(i).capacityUnits;
assert capacityUnits >= 1;
final int assignedForEach = alreadyAssignedSeconds / capacityUnits;
final int remainder = alreadyAssignedSeconds % capacityUnits;
for (int j = 0; j < capacityUnits; j++) {
int assignedSeconds = assignedForEach + (j < remainder ? 1 : 0);
shares.add(new Share(assignedSeconds - capacityEachOneSeconds));
}
result.add(new ShareSource(shares));
}
return result;
}
}