[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/test EdgeTest.java, 1.4, 1.5
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/test EdgeTest.java, 1.4, 1.5
|
From: rimestad <rim...@us...> - 2006-09-18 14:10:18
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/test In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17863/src/net/sourceforge/bprocessor/model/test Modified Files: EdgeTest.java Log Message: Made changes to extrude tool to use extend abstractpencil and therfore making escape work and modified offset to use Edge.offset and thereby giving way for offset of only a subset of edges... There are still some bugs to be fixed Index: EdgeTest.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/test/EdgeTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EdgeTest.java 5 Sep 2006 12:52:09 -0000 1.4 --- EdgeTest.java 18 Sep 2006 14:10:08 -0000 1.5 *************** *** 39,57 **** List offset = Edge.offset(edges, s, -1); Edge e = (Edge)offset.get(0); ! assertEquals(2.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(1); assertEquals(2.0, e.getFrom().getX(), 0.0001); ! assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(2); ! assertEquals(1.0, e.getFrom().getX(), 0.0001); assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(3); assertEquals(1.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); } --- 39,87 ---- List offset = Edge.offset(edges, s, -1); Edge e = (Edge)offset.get(0); ! assertEquals(1.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(1); assertEquals(2.0, e.getFrom().getX(), 0.0001); ! assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(2); ! assertEquals(2.0, e.getFrom().getX(), 0.0001); assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(3); assertEquals(1.0, e.getFrom().getX(), 0.0001); + assertEquals(2.0, e.getFrom().getY(), 0.0001); + assertEquals(0.0, e.getFrom().getZ(), 0.0001); + } + + /** + * Test the offset method in edge with only some edges + */ + public void testOffset7() { + Vertex v1 = new Vertex(0, 0, 0); + Vertex v2 = new Vertex(3, 0, 0); + Vertex v3 = new Vertex(3, 3, 0); + Vertex v4 = new Vertex(0, 3, 0); + Edge e1 = new Edge(v1, v2); + Edge e2 = new Edge(v2, v3); + Edge e3 = new Edge(v3, v4); + Edge e4 = new Edge(v4, v1); + ArrayList edges = new ArrayList(); + edges.add(e1); + edges.add(e2); + edges.add(e3); + edges.add(e4); + Surface s = new Surface(edges); + ArrayList tmp = new ArrayList(); + tmp.add(e1); + List offset = Edge.offset(tmp, s, -1); + Edge e = (Edge)offset.get(0); + assertEquals(0.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); + assertEquals(3.0, e.getTo().getX(), 0.0001); + assertEquals(1.0, e.getTo().getY(), 0.0001); + assertEquals(0.0, e.getTo().getZ(), 0.0001); } *************** *** 75,92 **** Surface s = new Surface(edges); List offset = Edge.offset(edges, s, -1); ! Edge e = (Edge)offset.get(0); assertEquals(2.0, e.getFrom().getX(), 0.0001); ! assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! e = (Edge)offset.get(1); ! assertEquals(2.0, e.getTo().getX(), 0.0001); assertEquals(2.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); ! e = (Edge)offset.get(2); assertEquals(1.0, e.getFrom().getX(), 0.0001); ! assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! e = (Edge)offset.get(3); ! assertEquals(1.0, e.getTo().getX(), 0.0001); assertEquals(1.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); --- 105,122 ---- Surface s = new Surface(edges); List offset = Edge.offset(edges, s, -1); ! Edge e = (Edge)offset.get(1); assertEquals(2.0, e.getFrom().getX(), 0.0001); ! assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! e = (Edge)offset.get(2); ! assertEquals(1.0, e.getTo().getX(), 0.0001); assertEquals(2.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); ! e = (Edge)offset.get(3); assertEquals(1.0, e.getFrom().getX(), 0.0001); ! assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! e = (Edge)offset.get(0); ! assertEquals(2.0, e.getTo().getX(), 0.0001); assertEquals(1.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); *************** *** 113,123 **** // offset 3 List offset = Edge.offset(edges, s, 3); ! Edge e = (Edge)offset.get(0); assertEquals(6.0, e.getFrom().getX(), 0.0001); ! assertEquals(-3.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! e = (Edge)offset.get(2); assertEquals(-3.0, e.getFrom().getX(), 0.0001); ! assertEquals(6.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); // offset 6 --- 143,153 ---- // offset 3 List offset = Edge.offset(edges, s, 3); ! Edge e = (Edge)offset.get(2); assertEquals(6.0, e.getFrom().getX(), 0.0001); ! assertEquals(6.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! e = (Edge)offset.get(0); assertEquals(-3.0, e.getFrom().getX(), 0.0001); ! assertEquals(-3.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); // offset 6 *************** *** 125,133 **** e = (Edge)offset.get(1); assertEquals(9.0, e.getFrom().getX(), 0.0001); ! assertEquals(9.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(3); assertEquals(-6.0, e.getFrom().getX(), 0.0001); ! assertEquals(-6.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); } --- 155,163 ---- e = (Edge)offset.get(1); assertEquals(9.0, e.getFrom().getX(), 0.0001); ! assertEquals(-6.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(3); assertEquals(-6.0, e.getFrom().getX(), 0.0001); ! assertEquals(9.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); } *************** *** 157,171 **** List offset = Edge.offset(which, s, -1); Edge e = (Edge)offset.get(1); ! assertEquals(0.0, e.getFrom().getX(), 0.0001); assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! assertEquals(3.0, e.getTo().getX(), 0.0001); assertEquals(2.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); e = (Edge)offset.get(0); ! assertEquals(3.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! assertEquals(0.0, e.getTo().getX(), 0.0001); assertEquals(1.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); --- 187,201 ---- List offset = Edge.offset(which, s, -1); Edge e = (Edge)offset.get(1); ! assertEquals(3.0, e.getFrom().getX(), 0.0001); assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! assertEquals(0.0, e.getTo().getX(), 0.0001); assertEquals(2.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); e = (Edge)offset.get(0); ! assertEquals(0.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! assertEquals(3.0, e.getTo().getX(), 0.0001); assertEquals(1.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); *************** *** 207,221 **** List offset = Edge.offset(which, s, -1); Edge e = (Edge)offset.get(1); ! assertEquals(-1.0, e.getFrom().getX(), 0.0001); assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! assertEquals(4.0, e.getTo().getX(), 0.0001); assertEquals(2.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); e = (Edge)offset.get(0); ! assertEquals(4.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! assertEquals(-1.0, e.getTo().getX(), 0.0001); assertEquals(1.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); --- 237,251 ---- List offset = Edge.offset(which, s, -1); Edge e = (Edge)offset.get(1); ! assertEquals(4.0, e.getFrom().getX(), 0.0001); assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! assertEquals(-1.0, e.getTo().getX(), 0.0001); assertEquals(2.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); e = (Edge)offset.get(0); ! assertEquals(-1.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); ! assertEquals(4.0, e.getTo().getX(), 0.0001); assertEquals(1.0, e.getTo().getY(), 0.0001); assertEquals(0.0, e.getTo().getZ(), 0.0001); *************** *** 244,259 **** Edge e = (Edge)offset.get(0); assertEquals(1.0, e.getFrom().getX(), 0.0001); ! assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(1); ! assertEquals(1.0, e.getFrom().getX(), 0.0001); assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(2); assertEquals(2.0, e.getFrom().getX(), 0.0001); ! assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(3); ! assertEquals(2.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); --- 274,289 ---- Edge e = (Edge)offset.get(0); assertEquals(1.0, e.getFrom().getX(), 0.0001); ! assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(1); ! assertEquals(2.0, e.getFrom().getX(), 0.0001); assertEquals(2.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(2); assertEquals(2.0, e.getFrom().getX(), 0.0001); ! assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); e = (Edge)offset.get(3); ! assertEquals(1.0, e.getFrom().getX(), 0.0001); assertEquals(1.0, e.getFrom().getY(), 0.0001); assertEquals(0.0, e.getFrom().getZ(), 0.0001); |
