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

ItEr59S08CUAsignacionRecursosLimitantesItEr58S10: Move method to data on which it operates

Browse source
This commit is contained in:
Óscar González Fernández 2010-06-06 15:32:30 +02:00
parent c6da0b2081
commit 629edba772
2 changed files with 76 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java
View file

@ -21,13 +21,18 @@
package org.navalplanner.business.planner.limiting.entities;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang.Validate;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.calendars.entities.ResourceCalendar;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.CriterionCompounder;
import org.navalplanner.business.resources.entities.ICriterion;
import org.navalplanner.business.resources.entities.Resource;
/**
@ -184,4 +189,73 @@ public class Gap implements Comparable<Gap> {
return (compareTo(gap) < 0);
}
public List<Gap> splitIntoGapsSatisfyingCriteria(Resource resource,
Set<Criterion> criteria) {
return splitIntoGapsSatisfyingCriteria(resource, criteria,
getStartTime(), getEndTime());
}
/**
* Returns a set of {@link Gap} composed by those gaps which satisfy
* <em>criteria</em> within the period: <em>gapStartTime</em> till
* <em>gapEndTime</em>
* @param resource
* @param criteria
* criteria to be satisfied by resource
* @param gapStartTime
* start time of gap
* @param gapEndTime
* end time of gap
* @return
*/
private static List<Gap> splitIntoGapsSatisfyingCriteria(Resource resource,
Set<Criterion> criteria, DateAndHour gapStartTime,
DateAndHour gapEndTime) {
final ICriterion compositedCriterion = CriterionCompounder.buildAnd(
criteria).getResult();
final ResourceCalendar calendar = resource.getCalendar();
// FIXME: If endTime is null (lastGap), set endTime as 100 years ahead
// startTime
final LocalDate gapEndDate = gapEndTime != null ? gapEndTime.getDate()
.plusDays(1) : gapStartTime.getDate().plusYears(10);
final LocalDate gapStartDate = gapStartTime.getDate();
List<Gap> result = new ArrayList<Gap>();
LocalDate date = gapStartDate;
boolean open = compositedCriterion
.isSatisfiedBy(resource, toDate(date));
DateAndHour startTime = gapStartTime, endTime;
while (date.isBefore(gapEndDate)) {
if (calendar.getCapacityAt(date) == 0) {
date = date.plusDays(1);
continue;
}
if (open == false
&& compositedCriterion
.isSatisfiedBy(resource, toDate(date))) {
startTime = new DateAndHour(date, 0);
open = true;
}
if (open == true
&& !compositedCriterion.isSatisfiedBy(resource,
toDate(date))) {
endTime = new DateAndHour(date, 0);
result.add(Gap.create(resource, startTime, endTime));
open = false;
}
date = date.plusDays(1);
}
result.add(Gap.create(resource, startTime, gapEndTime));
return result;
}
private static Date toDate(LocalDate date) {
return date != null ? date.toDateTimeAtStartOfDay().toDate() : null;
}
}

70
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java
View file

@ -22,7 +22,6 @@ package org.navalplanner.business.planner.limiting.entities;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
@ -38,8 +37,6 @@ import org.navalplanner.business.planner.entities.ResourcesPerDay;
import org.navalplanner.business.planner.entities.SpecificDayAssignment;
import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.CriterionCompounder;
import org.navalplanner.business.resources.entities.ICriterion;
import org.navalplanner.business.resources.entities.LimitingResourceQueue;
import org.navalplanner.business.resources.entities.Resource;
@ -111,8 +108,8 @@ public class LimitingResourceAllocator {
if (isSpecific(element) && gap.canFit(element)) {
result.add(gap);
} else if (isGeneric(element)) {
final List<Gap> gaps = splitIntoGapsSatisfyingCriteria(
resource, getCriteria(element), gap);
final List<Gap> gaps = gap.splitIntoGapsSatisfyingCriteria(
resource, getCriteria(element));
for (Gap subgap : gaps) {
if (subgap.canFit(element)) {
result.add(subgap);
@ -196,69 +193,6 @@ public class LimitingResourceAllocator {
return null;
}
private static Date toDate(LocalDate date) {
return date != null ? date.toDateTimeAtStartOfDay().toDate() : null;
}
private static List<Gap> splitIntoGapsSatisfyingCriteria(
Resource resource, Set<Criterion> criteria, Gap gap) {
return splitIntoGapsSatisfyingCriteria(resource, criteria, gap.getStartTime(), gap.getEndTime());
}
/**
* Returns a set of {@link Gap} composed by those gaps
* which satisfy <em>criteria</em> within the period: <em>gapStartTime</em> till <em>gapEndTime</em>
*
* @param resource
* @param criteria
* criteria to be satisfied by resource
* @param gapStartTime
* start time of gap
* @param gapEndTime
* end time of gap
* @return
*/
private static List<Gap> splitIntoGapsSatisfyingCriteria(
Resource resource, Set<Criterion> criteria, DateAndHour gapStartTime,
DateAndHour gapEndTime) {
final ICriterion compositedCriterion = CriterionCompounder.buildAnd(criteria)
.getResult();
final ResourceCalendar calendar = resource.getCalendar();
// FIXME: If endTime is null (lastGap), set endTime as 100 years ahead startTime
final LocalDate gapEndDate = gapEndTime != null ? gapEndTime.getDate().plusDays(1)
: gapStartTime.getDate().plusYears(10);
final LocalDate gapStartDate = gapStartTime.getDate();
List<Gap> result = new ArrayList<Gap>();
LocalDate date = gapStartDate;
boolean open = compositedCriterion.isSatisfiedBy(resource, toDate(date));
DateAndHour startTime = gapStartTime, endTime;
while (date.isBefore(gapEndDate)) {
if (calendar.getCapacityAt(date) == 0) {
date = date.plusDays(1);
continue;
}
if (open == false && compositedCriterion.isSatisfiedBy(resource, toDate(date))) {
startTime = new DateAndHour(date, 0);
open = true;
}
if (open == true && !compositedCriterion.isSatisfiedBy(resource, toDate(date))) {
endTime = new DateAndHour(date, 0);
result.add(Gap.create(resource,
startTime, endTime));
open = false;
}
date = date.plusDays(1);
}
result.add(Gap.create(resource, startTime, gapEndTime));
return result;
}
public static DateAndHour getFirstElementTime(List<DayAssignment> dayAssignments) {
final DayAssignment start = dayAssignments.get(0);
return new DateAndHour(start.getDay(), start.getHours());