[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model SpaceAnalysis.java, 1.3, 1.4 Surface.java, 1.180, 1.181

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

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

Modified Files:
	SpaceAnalysis.java Surface.java 
Log Message:
First step in space propagation
Refactored GenericTreeView sorting of children

Index: SpaceAnalysis.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/SpaceAnalysis.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SpaceAnalysis.java	27 Sep 2007 07:00:20 -0000	1.3
--- SpaceAnalysis.java	27 Sep 2007 08:33:13 -0000	1.4
***************
*** 54,65 ****
        }
      }
      for (Edge current : surface.getEdges()) {
        List<Surface> surfaces = edgemap.get(current);
        if (surfaces.size() > 1) {
-         System.out.println("select from " + surfaces + " around " + current);
          Surface selected = select(current, surfaces, surface, side);
-         System.out.println("selected = " + selected);
          if (travel(surface, current) == travel(selected, current)) {
-           System.out.println("SAME");
            if (side == 1) {
              selected.setBackDomain(surface.getFrontDomain());
--- 54,63 ----
        }
      }
+     
      for (Edge current : surface.getEdges()) {
        List<Surface> surfaces = edgemap.get(current);
        if (surfaces.size() > 1) {
          Surface selected = select(current, surfaces, surface, side);
          if (travel(surface, current) == travel(selected, current)) {
            if (side == 1) {
              selected.setBackDomain(surface.getFrontDomain());
***************
*** 68,72 ****
            }
          } else {
-           System.out.println("OTHER");
            if (side == 1) {
              selected.setFrontDomain(surface.getFrontDomain());
--- 66,69 ----
***************
*** 87,91 ****
      double minimum = 2 * Math.PI;
      double maximum = 0;
-     System.out.println("-- " + leader + " " + direction + " --");
      for (Surface current : surfaces) {
        if (current != leader) {
--- 84,87 ----

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -d -r1.180 -r1.181
*** Surface.java	27 Sep 2007 07:00:20 -0000	1.180
--- Surface.java	27 Sep 2007 08:33:13 -0000	1.181
***************
*** 1305,1310 ****
    public void assignBack(Space back) {
      setBackDomain(back);
!     //SpaceAnalysis analysis = new SpaceAnalysis();
!     //analysis.propagate(this, -1);
    }
    
--- 1305,1310 ----
    public void assignBack(Space back) {
      setBackDomain(back);
!     SpaceAnalysis analysis = new SpaceAnalysis();
!     analysis.propagate(this, -1);
    }
    
***************
*** 1330,1335 ****
    public void assignFront(Space front) {
      setFrontDomain(front);
!     //SpaceAnalysis analysis = new SpaceAnalysis();
!     //analysis.propagate(this, 1);
    }
    
--- 1330,1335 ----
    public void assignFront(Space front) {
      setFrontDomain(front);
!     SpaceAnalysis analysis = new SpaceAnalysis();
!     analysis.propagate(this, 1);
    }