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

[Bug #712] Fixing problems with special dependencies in containers.

Browse source 
FEA: ItEr63S03BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2010-11-17 16:52:39 +01:00
parent 4f489af637
commit 94e2987c86
1 changed files with 67 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/CriticalPathCalculator.java
View file

@ -21,6 +21,7 @@
package org.zkoss.ganttz.data.criticalpath;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@ -56,9 +57,13 @@ public class CriticalPathCalculator<T, D extends IDependency<T>> {
private InitialNode<T, D> bop;
private LastNode<T, D> eop;
private Map<T, Map<T, DependencyType>> dependencies;
public List<T> calculateCriticalPath(ICriticalPathCalculable<T> graph) {
this.graph = graph;
dependencies = new HashMap<T, Map<T, DependencyType>>();
initDate = calculateInitDate();
bop = createBeginningOfProjectNode();
@ -153,16 +158,59 @@ public class CriticalPathCalculator<T, D extends IDependency<T>> {
} else {
related = graph.getOutgoingTasksFor(t);
}
result.addAll(removeChildrenAndParents(t, related));
Collection<T> toAdd = removeChildrenAndParents(t, related);
result.addAll(toAdd);
for (T i : toAdd) {
if (graph.isContainer(i)) {
IDependency<T> dependency;
if (incoming) {
dependency = graph.getDependencyFrom(i, t);
} else {
dependency = graph.getDependencyFrom(t, i);
}
if (dependency != null
&& dependency.getType() != DependencyType.END_START) {
for (T j : removeContainers(Arrays.asList(i))) {
if (incoming) {
addDepedency(j, task, dependency.getType());
} else {
addDepedency(task, j, dependency.getType());
}
}
}
}
}
} else {
result.add(t);
if (graph.isContainer(t)) {
IDependency<T> dependency;
if (incoming) {
dependency = graph.getDependencyFrom(t, task);
} else {
dependency = graph.getDependencyFrom(task, t);
}
if (dependency != null
&& dependency.getType() != DependencyType.END_START) {
for (T i : removeContainers(Arrays.asList(t))) {
if (incoming) {
addDepedency(i, task, dependency.getType());
} else {
addDepedency(task, i, dependency.getType());
}
}
}
}
}
}
return new HashSet<T>(removeContainers(result));
}
private Collection<? extends T> removeChildrenAndParents(T task, Set<T> tasks) {
private Collection<T> removeChildrenAndParents(T task, Set<T> tasks) {
Set<T> result = new HashSet<T>();
for (T t : tasks) {
if (!graph.contains(task, t)) {
@ -175,11 +223,28 @@ public class CriticalPathCalculator<T, D extends IDependency<T>> {
return result;
}
private void addDepedency(T from, T destination, DependencyType type) {
Map<T, DependencyType> destinations = dependencies.get(from);
if (destinations == null) {
destinations = new HashMap<T, DependencyType>();
dependencies.put(from, destinations);
}
destinations.put(destination, type);
}
private DependencyType getDependencyTypeEndStartByDefault(T from, T to) {
if ((from != null) && (to != null)) {
IDependency<T> dependency = graph.getDependencyFrom(from, to);
if (dependency != null) {
return dependency.getType();
} else {
Map<T, DependencyType> destinations = dependencies.get(from);
if (destinations != null) {
DependencyType type = destinations.get(to);
if (type != null) {
return type;
}
}
}
}
return DependencyType.END_START;