[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Command.java, 1.54, 1.55 Space.java, 1.221, 1.222

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

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

Modified Files:
	Command.java Space.java 
Log Message:
Cleanup

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.221
retrieving revision 1.222
diff -C2 -d -r1.221 -r1.222
*** Space.java	12 Dec 2007 14:38:43 -0000	1.221
--- Space.java	12 Dec 2007 15:06:55 -0000	1.222
***************
*** 1107,1125 ****
  
    /**
!    * Return the center of gravity
!    * @return The center vertex
     */
    @Override
    public Vertex center() {
!     Vertex average = new Vertex(0, 0, 0);
!     Set verts = collect();
!     if (!verts.isEmpty()) {
!       Iterator it = verts.iterator();
!       while (it.hasNext()) {
!         average = average.add((Vertex)it.next());
!       } 
!       average.scaleIt(1.0 / (double)verts.size());
!     }
!     return average;
    }
    
--- 1107,1115 ----
  
    /**
!    * {@inheritDoc}
     */
    @Override
    public Vertex center() {
!     return Vertex.center(collect());
    }
    

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Command.java	12 Dec 2007 12:48:23 -0000	1.54
--- Command.java	12 Dec 2007 15:06:55 -0000	1.55
***************
*** 474,497 ****
          return e1.to;
        }
!     }
!     
!     /**
!      * Compute the average of a collection of vertices
!      * @param vertices collection of vertices
!      * @return average
!      */
!     public static Vertex average(Collection<Vertex> vertices) {
!       double x = 0;
!       double y = 0;
!       double z = 0;
!       for (Vertex current : vertices) {
!         x += current.x;
!         y += current.y;
!         z += current.z;
!       }
!       int n = vertices.size();
!       return new Vertex(x / n, y / n, z / n);
!     }
!     
      
      private List<Surface> subdivide(List<Surface> faces) {
--- 474,478 ----
          return e1.to;
        }
!     } 
      
      private List<Surface> subdivide(List<Surface> faces) {
***************
*** 565,569 ****
                vs.add(edge.otherVertex(edgepoint));
              }
!             edgepoint.set(average(vs));
            }
          }
--- 546,550 ----
                vs.add(edge.otherVertex(edgepoint));
              }
!             edgepoint.set(Vertex.center(vs));
            }
          }
***************
*** 595,600 ****
              }
  
!             Vertex a1 = average(vs);
!             Vertex a2 = average(fs);
              double x = ((n - 2) * current.x) / n + a1.x / n + a2.x / n;
              double y = ((n - 2) * current.y) / n + a1.y / n + a2.y / n;
--- 576,581 ----
              }
  
!             Vertex a1 = Vertex.center(vs);
!             Vertex a2 = Vertex.center(fs);
              double x = ((n - 2) * current.x) / n + a1.x / n + a2.x / n;
              double y = ((n - 2) * current.y) / n + a1.y / n + a2.y / n;