[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Edge.java, 1.53, 1.54

[rimestad <rim...@us...>]

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

Modified Files:
	Edge.java 
Log Message:
made windmodellor, there are some bugs, will be worked out, there are one bug in offset as well.

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Edge.java	28 Aug 2006 14:48:25 -0000	1.53
--- Edge.java	28 Aug 2006 16:44:41 -0000	1.54
***************
*** 574,578 ****
          v2v.put(from, e.getFrom());
          res.add(new Edge(to, from));
!         Vertex common = Edge.commonVertex(e, prevEdge);
          if (common == e.getFrom() || common == null) {
            from2edge.put(e.getFrom(), e);
--- 574,585 ----
          v2v.put(from, e.getFrom());
          res.add(new Edge(to, from));
!         if (from2edge.containsKey(e.getFrom())) {
!           from2edge.put(e.getTo(), e);
!           to2edge.put(e.getFrom(), e);
!         } else {
!           from2edge.put(e.getFrom(), e);
!           to2edge.put(e.getTo(), e);
!         }
!         /*Vertex common = Edge.commonVertex(e, prevEdge);
          if (common == e.getFrom() || common == null) {
            from2edge.put(e.getFrom(), e);
***************
*** 581,588 ****
            from2edge.put(e.getTo(), e);
            to2edge.put(e.getFrom(), e);
!         }
        } else {
!         from2edge.put(e.getFrom(), e);
!         to2edge.put(e.getTo(), e);
        }
        prevEdge = e;
--- 588,600 ----
            from2edge.put(e.getTo(), e);
            to2edge.put(e.getFrom(), e);
!         }*/
        } else {
!         if (from2edge.containsKey(e.getFrom())) {
!           from2edge.put(e.getTo(), e);
!           to2edge.put(e.getFrom(), e);
!         } else {
!           from2edge.put(e.getFrom(), e);
!           to2edge.put(e.getTo(), e);
!         }
        }
        prevEdge = e;
***************
*** 590,593 ****
--- 602,608 ----
      // calculate the directions
      iter = directions.values().iterator();
+     System.out.println("To size " + to2edge.size());
+     System.out.println("From size " + from2edge.size());
+     System.out.println("Vertices " + directions.size());
      while (iter.hasNext()) {
        Direction dir = (Direction)iter.next();