|
3 | 3 | import org.jgrapht.EdgeFactory;
|
4 | 4 | import org.jgrapht.graph.ClassBasedEdgeFactory;
|
5 | 5 | import org.jgrapht.graph.DefaultEdge;
|
| 6 | +import org.jgrapht.graph.DefaultWeightedEdge; |
6 | 7 | import org.jgrapht.intervalgraph.interval.Interval;
|
7 | 8 | import org.jgrapht.intervalgraph.interval.IntervalVertex;
|
8 | 9 | import org.jgrapht.intervalgraph.interval.IntervalVertexInterface;
|
|
20 | 21 | public class IntervalGraphTest {
|
21 | 22 |
|
22 | 23 | private IntervalGraph<IntervalVertexInterface<Integer, Integer>, DefaultEdge, Integer, Integer> intervalGraph;
|
23 |
| - private IntervalGraph<IntervalVertexInterface<Integer, Integer>, DefaultEdge, Integer, Integer> weightedIntervalGraph; |
| 24 | + private IntervalGraph<IntervalVertexInterface<Integer, Integer>, DefaultWeightedEdge, Integer, Integer> weightedIntervalGraph; |
24 | 25 |
|
25 | 26 | @Before
|
26 | 27 | public void setUp() {
|
27 |
| - EdgeFactory<IntervalVertexInterface<Integer, Integer>, DefaultEdge> edgeFactory = new ClassBasedEdgeFactory<>(DefaultEdge.class); |
| 28 | + EdgeFactory<IntervalVertexInterface<Integer, Integer>, DefaultEdge> edgeFactory1 = new ClassBasedEdgeFactory<>(DefaultEdge.class); |
| 29 | + EdgeFactory<IntervalVertexInterface<Integer, Integer>, DefaultWeightedEdge> edgeFactory2 = new ClassBasedEdgeFactory<>(DefaultWeightedEdge.class); |
28 | 30 |
|
29 |
| - intervalGraph = new IntervalGraph<>(edgeFactory, false); |
| 31 | + intervalGraph = new IntervalGraph<>(edgeFactory1, false); |
30 | 32 |
|
31 |
| - weightedIntervalGraph = new IntervalGraph<>(edgeFactory, true); |
| 33 | + weightedIntervalGraph = new IntervalGraph<>(edgeFactory2, true); |
32 | 34 | }
|
33 | 35 |
|
34 | 36 | @Test(expected = IllegalArgumentException.class)
|
@@ -140,7 +142,7 @@ public void getAllEdges() {
|
140 | 142 | assertTrue(edgeSet.isEmpty());
|
141 | 143 |
|
142 | 144 | Set<DefaultEdge> weightedEdgeSet = weightedIntervalGraph.getAllEdges(vertex1, vertex2);
|
143 |
| - assertTrue(edgeSet.contains(weightedIntervalGraph.getEdge(vertex1, vertex2))); |
| 145 | + assertTrue(weightedEdgeSet.contains(weightedIntervalGraph.getEdge(vertex1, vertex2))); |
144 | 146 | assertEquals(weightedEdgeSet.size(), 1);
|
145 | 147 |
|
146 | 148 | weightedEdgeSet = weightedIntervalGraph.getAllEdges(vertex1, vertex4);
|
@@ -467,14 +469,14 @@ public void setEdgeWeight() {
|
467 | 469 | IntervalVertex<Integer, Integer> vertex3 = IntervalVertex.of(3, interval3);
|
468 | 470 | weightedIntervalGraph.addVertex(vertex3);
|
469 | 471 |
|
470 |
| - DefaultEdge edge1 = weightedIntervalGraph.getEdge(vertex1, vertex2); |
471 |
| - DefaultEdge edge2 = weightedIntervalGraph.getEdge(vertex1, vertex3); |
| 472 | + DefaultWeightedEdge edge1 = weightedIntervalGraph.getEdge(vertex1, vertex2); |
| 473 | + DefaultWeightedEdge edge2 = weightedIntervalGraph.getEdge(vertex1, vertex3); |
472 | 474 |
|
473 |
| - intervalGraph.setEdgeWeight(edge1, 3); |
474 |
| - intervalGraph.setEdgeWeight(edge2, 93); |
| 475 | + weightedIntervalGraph.setEdgeWeight(edge1, 3.0); |
| 476 | + weightedIntervalGraph.setEdgeWeight(edge2, 93.0); |
475 | 477 |
|
476 |
| - assertEquals(intervalGraph.getEdgeWeight(edge1), 3); |
477 |
| - assertEquals(intervalGraph.getEdgeWeight(edge2), 93); |
| 478 | + assertEquals(3.0, weightedIntervalGraph.getEdgeWeight(edge1), 0.001); |
| 479 | + assertEquals(93.0, weightedIntervalGraph.getEdgeWeight(edge2),0.001); |
478 | 480 |
|
479 | 481 | }
|
480 | 482 |
|
|
0 commit comments