Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Underped my generics

Browse source
This commit is contained in:
pahimar 2013-05-29 15:03:49 -04:00
parent 12e80773ed
commit 376b37d4bf
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ee3_common/com/pahimar/ee3/emc/graph/WeightedDirectedGraph.java
View file

@ -10,9 +10,9 @@ import java.util.NoSuchElementException;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
public class WeightedDirectedGraph<T, E extends WeightedEdge<T>> implements Iterable<T> { public class WeightedDirectedGraph<T> implements Iterable<T> {
private final Map<T, SortedSet<E>> graph = new HashMap<T, SortedSet<E>>(); private final Map<T, SortedSet<WeightedEdge<T>>> graph = new HashMap<T, SortedSet<WeightedEdge<T>>>();
private List<T> orderedNodes = new ArrayList<T>(); private List<T> orderedNodes = new ArrayList<T>();
public boolean addNode(T node) public boolean addNode(T node)
@ -23,9 +23,9 @@ public class WeightedDirectedGraph<T, E extends WeightedEdge<T>> implements Iter
} }
orderedNodes.add(node); orderedNodes.add(node);
graph.put(node, new TreeSet<E>(new Comparator<E>() graph.put(node, new TreeSet<WeightedEdge<T>>(new Comparator<WeightedEdge<T>>()
{ {
public int compare(E o1, E o2) { public int compare(WeightedEdge<T> o1, WeightedEdge<T> o2) {
return orderedNodes.indexOf(o1)-orderedNodes.indexOf(o2); return orderedNodes.indexOf(o1)-orderedNodes.indexOf(o2);
} }
})); }));
@ -35,15 +35,7 @@ public class WeightedDirectedGraph<T, E extends WeightedEdge<T>> implements Iter
public void addEdge(T from, T to) public void addEdge(T from, T to)
{ {
if (!(graph.containsKey(from) && graph.containsKey(to))) addEdge(from, to, 1);
{
throw new NoSuchElementException("Missing nodes from graph");
}
@SuppressWarnings("unchecked")
E edge = (E) new WeightedEdge<T>(1, to);
graph.get(from).add(edge);
} }
public void addEdge(T from, T to, int weight) public void addEdge(T from, T to, int weight)
@ -53,8 +45,7 @@ public class WeightedDirectedGraph<T, E extends WeightedEdge<T>> implements Iter
throw new NoSuchElementException("Missing nodes from graph"); throw new NoSuchElementException("Missing nodes from graph");
} }
@SuppressWarnings("unchecked") WeightedEdge<T> edge = new WeightedEdge<T>(weight, to);
E edge = (E) new WeightedEdge<T>(weight, to);
graph.get(from).add(edge); graph.get(from).add(edge);
} }