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

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

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

Modified Files:
	SpaceAnalysis.java Surface.java 
Log Message:
Good progress on space assignment propagation

Index: SpaceAnalysis.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/SpaceAnalysis.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SpaceAnalysis.java	26 Sep 2007 14:30:22 -0000	1.2
--- SpaceAnalysis.java	27 Sep 2007 07:00:20 -0000	1.3
***************
*** 20,24 ****
   
    private static final int FORWARD = 1;
!   private static final int BACKWARD = 2;
    
    private static int travel(Surface surface, Edge edge) {
--- 20,24 ----
   
    private static final int FORWARD = 1;
!   private static final int BACKWARD = -1;
    
    private static int travel(Surface surface, Edge edge) {
***************
*** 83,94 ****
      Vertex i = leader.normal();
      int direction = travel(leader, edge);
      Surface selected = leader;
      double minimum = 2 * Math.PI;
!     if (side < 0) {
!       i.scale(-1);
!       n.scale(-1);
!     }
!     
!     System.out.println("-- " + leader + " --");
      for (Surface current : surfaces) {
        if (current != leader) {
--- 83,91 ----
      Vertex i = leader.normal();
      int direction = travel(leader, edge);
+     n.scale(direction);
      Surface selected = leader;
      double minimum = 2 * Math.PI;
!     double maximum = 0;
!     System.out.println("-- " + leader + " " + direction + " --");
      for (Surface current : surfaces) {
        if (current != leader) {
***************
*** 104,110 ****
            angle = 2 * Math.PI - angle;
          }
!         if (angle < minimum) {
!           selected = current;
!           minimum = angle;
          }
        }
--- 101,114 ----
            angle = 2 * Math.PI - angle;
          }
!         if (side < 0) {
!           if (angle > maximum) {
!             selected = current;
!             maximum = angle;
!           }
!         } else {
!           if (angle < minimum) {
!             selected = current;
!             minimum = angle;
!           }
          }
        }

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** Surface.java	26 Sep 2007 14:30:23 -0000	1.179
--- Surface.java	27 Sep 2007 07:00:20 -0000	1.180
***************
*** 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,1334 ****
    public void assignFront(Space front) {
      setFrontDomain(front);
!     // SpaceAnalysis analysis = new SpaceAnalysis();
      //analysis.propagate(this, 1);
    }
--- 1330,1334 ----
    public void assignFront(Space front) {
      setFrontDomain(front);
!     //SpaceAnalysis analysis = new SpaceAnalysis();
      //analysis.propagate(this, 1);
    }