[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.126, 1.127

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20408/src/net/sourceforge/bprocessor/model

Modified Files:
	Surface.java 
Log Message:
Simplified hole-analysis to get rid of bug

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** Surface.java	11 Dec 2006 10:04:43 -0000	1.126
--- Surface.java	12 Dec 2006 13:59:14 -0000	1.127
***************
*** 1186,1208 ****
      while (iter.hasNext()) {
        Vertex current = (Vertex) iter.next();
!       if (!onBoundary(current)) {
!         if (!surrounds(current)) {
!           return false;
!         }
!       }
!     }
!     iter = hole.getEdges().iterator();
!     while (iter.hasNext()) {
!       Edge current = (Edge) iter.next();
!       Iterator inner = getEdges().iterator();
!       while (inner.hasNext()) {
!         Edge e = (Edge) inner.next();
!         Edge inter = e.intersection(current);
!         if (inter != null && inter.getLength() < 0.00001) {
!           boolean res = (current.coincides(inter.getFrom()) && e.coincides(inter.getFrom()));
!           if (res) {
!             return false;
!           }
!         }
        }
      }
--- 1186,1191 ----
      while (iter.hasNext()) {
        Vertex current = (Vertex) iter.next();
!       if (!surrounds(current)) {
!         return false;
        }
      }