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

ItEr49S10CUVisualizacionResponsabilidadesTRaballoNaPlanificacionItEr48S10: Extracted code to calculate there are hours on to a method object.

Browse source 
This allows that for the CombinedWorkHours is calculated correctly if
there are hours on.
This commit is contained in:
Óscar González Fernández 2010-03-06 17:02:51 +01:00
parent f68d4a581d
commit 58a7a4826a
4 changed files with 115 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
View file

@ -30,10 +30,6 @@ import java.util.Set;
import org.hibernate.validator.NotEmpty;
import org.joda.time.DateTimeConstants;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.EndOfTime;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.FixedPoint;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.Interval;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.StartOfTime;
import org.navalplanner.business.calendars.entities.CalendarData.Days;
import org.navalplanner.business.common.BaseEntity;
import org.navalplanner.business.planner.entities.ResourcesPerDay;
@ -845,60 +841,8 @@ public class BaseCalendar extends BaseEntity implements IWorkHours {
@Override
public boolean thereAreHoursOn(AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, int hoursToAllocate) {
if (hoursToAllocate == 0) {
return true;
}
if (resourcesPerDay.isZero()) {
return false;
}
addInvaliditiesDerivedFromCalendar(availability);
List<Interval> validPeriods = availability.getValidPeriods();
if (validPeriods.isEmpty()) {
return false;
}
Interval last = getLast(validPeriods);
Interval first = validPeriods.get(0);
final boolean isOpenEnded = last.getEnd().equals(EndOfTime.create())
|| first.getStart().equals(StartOfTime.create());
return isOpenEnded
|| thereAreHoursOn(hoursToAllocate, resourcesPerDay,
validPeriods);
}
private boolean thereAreHoursOn(int hoursToAllocate,
ResourcesPerDay resourcesPerDay, List<Interval> validPeriods) {
int sum = 0;
for (Interval each : validPeriods) {
FixedPoint start = (FixedPoint) each.getStart();
FixedPoint end = (FixedPoint) each.getEnd();
int pending = hoursToAllocate - sum;
sum += sumHoursUntil(pending, resourcesPerDay, start.getDate(), end
.getDate());
if (sum >= hoursToAllocate) {
return true;
}
}
return false;
}
private int sumHoursUntil(int maximum, ResourcesPerDay resourcesPerDay,
LocalDate start, LocalDate end) {
int result = 0;
int days = org.joda.time.Days.daysBetween(start, end).getDays();
for (int i = 0; i < days; i++) {
LocalDate current = start.plusDays(i);
result += toHours(current, resourcesPerDay);
if (result >= maximum) {
return result;
}
}
return result;
}
private Interval getLast(List<Interval> validPeriods) {
return validPeriods.get(validPeriods.size() - 1);
return ThereAreHoursOnWorkHoursCalculator.thereAreHoursOn(this,
availability, resourcesPerDay, hoursToAllocate);
}
public boolean onlyGivesZeroHours() {

9
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java
View file

@ -89,13 +89,8 @@ public abstract class CombinedWorkHours implements IWorkHours {
@Override
public boolean thereAreHoursOn(AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, int hoursToAllocate) {
for (IWorkHours each : workHours) {
if (!each.thereAreHoursOn(availability, resourcesPerDay,
hoursToAllocate)) {
return false;
}
}
return true;
return ThereAreHoursOnWorkHoursCalculator.thereAreHoursOn(this,
availability, resourcesPerDay, hoursToAllocate);
}
}

107
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ThereAreHoursOnWorkHoursCalculator.java Normal file
View file

@ -0,0 +1,107 @@
/*
* This file is part of NavalPlan
*
* Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
* Desenvolvemento Tecnolóxico de Galicia
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.business.calendars.entities;
import java.util.List;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.EndOfTime;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.FixedPoint;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.Interval;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.StartOfTime;
import org.navalplanner.business.planner.entities.ResourcesPerDay;
/**
* @author Óscar González Fernández <ogonzalez@igalia.com>
*/
public class ThereAreHoursOnWorkHoursCalculator {
// Not instantiable
private ThereAreHoursOnWorkHoursCalculator() {
}
/**
* Caculates if there are enough hours
*/
public static boolean thereAreHoursOn(IWorkHours workHours,
AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, int hoursToAllocate) {
if (hoursToAllocate == 0) {
return true;
}
if (resourcesPerDay.isZero()) {
return false;
}
AvailabilityTimeLine realAvailability = workHours.getAvailability()
.and(availability);
List<Interval> validPeriods = realAvailability.getValidPeriods();
if (validPeriods.isEmpty()) {
return false;
}
Interval last = getLast(validPeriods);
Interval first = validPeriods.get(0);
final boolean isOpenEnded = last.getEnd().equals(EndOfTime.create())
|| first.getStart().equals(StartOfTime.create());
return isOpenEnded
|| thereAreHoursOn(workHours, hoursToAllocate, resourcesPerDay,
validPeriods);
}
private static Interval getLast(List<Interval> validPeriods) {
return validPeriods.get(validPeriods.size() - 1);
}
private static boolean thereAreHoursOn(IWorkHours workHours,
int hoursToAllocate,
ResourcesPerDay resourcesPerDay, List<Interval> validPeriods) {
int sum = 0;
for (Interval each : validPeriods) {
FixedPoint start = (FixedPoint) each.getStart();
FixedPoint end = (FixedPoint) each.getEnd();
int pending = hoursToAllocate - sum;
sum += sumHoursUntil(workHours, pending, resourcesPerDay, start
.getDate(), end
.getDate());
if (sum >= hoursToAllocate) {
return true;
}
}
return false;
}
private static int sumHoursUntil(IWorkHours workHours, int maximum,
ResourcesPerDay resourcesPerDay,
LocalDate start, LocalDate end) {
int result = 0;
int days = org.joda.time.Days.daysBetween(start, end).getDays();
for (int i = 0; i < days; i++) {
LocalDate current = start.plusDays(i);
result += workHours.toHours(current, resourcesPerDay);
if (result >= maximum) {
return result;
}
}
return result;
}
}

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

@ -39,6 +39,7 @@ import org.navalplanner.business.calendars.entities.AvailabilityTimeLine;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.calendars.entities.IWorkHours;
import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay;
import org.navalplanner.business.calendars.entities.ThereAreHoursOnWorkHoursCalculator;
import org.navalplanner.business.common.BaseEntity;
import org.navalplanner.business.planner.entities.DerivedAllocationGenerator.IWorkerFinder;
import org.navalplanner.business.planner.entities.allocationalgorithms.AllocatorForSpecifiedResourcesPerDayAndHours;
@ -591,11 +592,9 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
@Override
public boolean thereAreHoursOn(AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, int hoursToAllocate) {
if (getTaskCalendar() == null) {
return true;
}
return getTaskCalendar().thereAreHoursOn(availability,
resourcesPerDay, hoursToAllocate);
return ThereAreHoursOnWorkHoursCalculator.thereAreHoursOn(this,
availability, resourcesPerDay,
hoursToAllocate);
}
@Override