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

[Bug #1204] Do not round hours in Sigmoide allocation

Browse source 
As now EffortDuration is supported in order to allocate hours, we don't
need to round hours in Sigmoide allocation. So, hours fragmentation is
changed to 15min.

This prevents us to have the problem reported in this issue with
negative values so far.

FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-10-10 18:16:29 +02:00
parent 2093113eef
commit 90dc77df40
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java
View file

@ -39,8 +39,9 @@ public class SigmoidFunction extends AssignmentFunction {
private static final int ROUND_MODE = BigDecimal.ROUND_HALF_EVEN;
// Fragmentation of hours (0.25, 0.50, 0.75, 1). 1 indicates no fragmentation
private static final BigDecimal HOUR_FRAGMENTATION = BigDecimal.valueOf(1);
// Fragmentation of hours (0.25, 0.50, 0.75, 1)
private static final BigDecimal HOUR_FRAGMENTATION = BigDecimal
.valueOf(0.25);
public static SigmoidFunction create() {
return create(new SigmoidFunction());
@ -86,9 +87,11 @@ public class SigmoidFunction extends AssignmentFunction {
// Starting from startDate do allocation, one slot of hours per day in resource
LocalDate day = new LocalDate(start);
int hours = 0, i = 0;
EffortDuration hours = EffortDuration.zero();
int i = 0;
while (i < hoursToAllocatePerDay.length) {
hours = hoursToAllocatePerDay[i].intValue();
hours = EffortDuration
.fromHoursAsBigDecimal(hoursToAllocatePerDay[i]);
capacity = calendar.getCapacityOn(PartialDay.wholeDay(day));
if (!EffortDuration.zero().equals(capacity)) {
allocate(resourceAllocation, day, hours);
@ -134,8 +137,9 @@ public class SigmoidFunction extends AssignmentFunction {
}
if (i + 1 <= length) {
BigDecimal next = hoursToAllocatePerDay[i + 1];
hoursToAllocatePerDay[i + 1] = next.subtract(BigDecimal.ONE);
hoursToAllocatePerDay[i] = hours.add(BigDecimal.ONE);
hoursToAllocatePerDay[i + 1] = next
.subtract(HOUR_FRAGMENTATION);
hoursToAllocatePerDay[i] = hours.add(HOUR_FRAGMENTATION);
}
}
}
@ -167,10 +171,10 @@ public class SigmoidFunction extends AssignmentFunction {
}
private void allocate(ResourceAllocation<?> resourceAllocation,
LocalDate day, int hours) {
LocalDate day, EffortDuration hours) {
final LocalDate nextDay = day.plusDays(1);
resourceAllocation.withPreviousAssociatedResources()
.onInterval(day, nextDay).allocateHours(hours);
.onInterval(day, nextDay).allocate(hours);
}
private BigDecimal[] roundValues(BigDecimal[] allocatedHoursPerDay,

6
navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
View file

@ -160,6 +160,12 @@ public class EffortDuration implements Comparable<EffortDuration> {
return elapsing(amount, Granularity.SECONDS);
}
public static EffortDuration fromHoursAsBigDecimal(BigDecimal hours) {
BigDecimal secondsPerHour = new BigDecimal(3600);
return elapsing(hours.multiply(secondsPerHour).intValue(),
Granularity.SECONDS);
}
private final int seconds;
private EffortDuration(int seconds) {