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

ItEr27S07CUVistaRecursosTempoPorProxectoItEr26S08: Refactoring algorithm and fixing bug.

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-29 22:59:13 +02:00
parent e77891798c
commit eb34ee7e14
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/LoadPeriodGenerator.java
View file

@ -134,7 +134,7 @@ abstract class LoadPeriodGenerator {
allocationsOnInterval);
}
private boolean overlaps(LoadPeriodGenerator other) {
boolean overlaps(LoadPeriodGenerator other) {
return (start.compareTo(other.end) < 0 && other.start
.compareTo(this.end) < 0);
}

26
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -237,15 +237,14 @@ class PeriodsBuilder {
ListIterator<LoadPeriodGenerator> iterator = loadPeriodsGenerators
.listIterator();
while (iterator.hasNext()) {
LoadPeriodGenerator current = iterator.next();
if (iterator.hasNext()) {
final LoadPeriodGenerator current = findNextOneOverlapping(iterator);
if (current != null) {
rewind(iterator, current);
iterator.remove();
LoadPeriodGenerator next = iterator.next();
iterator.remove();
List<LoadPeriodGenerator> generated = current.join(next);
final LoadPeriodGenerator nextOne = generated.size() > 1 ? generated
.get(1)
: generated.get(0);
final LoadPeriodGenerator positionToComeBack = generated.get(0);
List<LoadPeriodGenerator> sortedByStartDate = mergeListsKeepingByStartSortOrder(
generated, loadPeriodsGenerators.subList(iterator
.nextIndex(), loadPeriodsGenerators.size()));
@ -253,11 +252,26 @@ class PeriodsBuilder {
- generated.size();
removeNextElements(iterator, takenFromRemaining);
addAtCurrentPosition(iterator, sortedByStartDate);
rewind(iterator, nextOne);
rewind(iterator, positionToComeBack);
}
}
}
private LoadPeriodGenerator findNextOneOverlapping(
ListIterator<LoadPeriodGenerator> iterator) {
while (iterator.hasNext()) {
LoadPeriodGenerator current = iterator.next();
if (!iterator.hasNext()) {
return null;
}
LoadPeriodGenerator next = peekNext(iterator);
if (current.overlaps(next)) {
return current;
}
}
return null;
}
private void addAtCurrentPosition(
ListIterator<LoadPeriodGenerator> iterator,
List<LoadPeriodGenerator> sortedByStartDate) {