[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Grid.java, 1.8, 1.9 Command.java, 1.79, 1.80 ParameterBlock.java, 1.17, 1.18

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4395/src/net/sourceforge/bprocessor/model

Modified Files:
	Grid.java Command.java ParameterBlock.java 
Log Message:
rounding of numbers

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** Command.java	25 Jun 2009 22:17:30 -0000	1.79
--- Command.java	9 Sep 2009 12:51:32 -0000	1.80
***************
*** 859,863 ****
      public Split(Edge edge) {
        parameters.put(new Attribute("edge", edge));
!       parameters.putDouble("n", 2);
      }
      /**
--- 859,863 ----
      public Split(Edge edge) {
        parameters.put(new Attribute("edge", edge));
!       parameters.putInteger("n", 2);
      }
      /**
***************
*** 873,877 ****
      public void evaluate() {
        Edge edge = (Edge) parameters.get("edge");
!       int n = (int) parameters.getDouble("n");
        Vertex from = edge.from;
        Vertex to = edge.to;
--- 873,877 ----
      public void evaluate() {
        Edge edge = (Edge) parameters.get("edge");
!       int n = (int) parameters.getInteger("n");
        Vertex from = edge.from;
        Vertex to = edge.to;

Index: ParameterBlock.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ParameterBlock.java	20 Feb 2008 15:20:23 -0000	1.17
--- ParameterBlock.java	9 Sep 2009 12:51:32 -0000	1.18
***************
*** 56,59 ****
--- 56,68 ----
    
    /**
+    * 
+    * @param key String
+    * @param value int
+    */
+   public void putInteger(String key, int value) {
+     add(new Attribute(key, new Integer(value)));
+   }
+   
+   /**
     * Put
     * @param key String
***************
*** 89,92 ****
--- 98,115 ----
     * 
     * @param key String
+    * @return int
+    */
+   public int getInteger(String key) {
+     for (Attribute current : parameters) {
+       if (current.getName().equals(key)) {
+         return ((Integer)(current.getValue())).intValue();
+       }
+     }
+     return 0;
+   }
+   
+   /**
+    * 
+    * @param key String
     * @return boolean value
     */

Index: Grid.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Grid.java	9 Sep 2009 10:31:00 -0000	1.8
--- Grid.java	9 Sep 2009 12:51:32 -0000	1.9
***************
*** 119,123 ****
      Vertex v = system.getI();
      Vertex u = system.getJ();
!     int n = (int) Math.floor((size / 2) / delta);
  
      Collection<Line> lines = new LinkedList();
--- 119,123 ----
      Vertex v = system.getI();
      Vertex u = system.getJ();
!     int n = (int) Math.round((size / 2) / delta);
  
      Collection<Line> lines = new LinkedList();
***************
*** 173,178 ****
        double h = getHeight();
        double d = getDistance();
!       int n = (int) Math.floor((w + d) / d);
!       int m = (int) Math.floor((h + d) / d);
        Vertex from = origin.copy();
        for (int k = 0; k < n; k++) {
--- 173,178 ----
        double h = getHeight();
        double d = getDistance();
!       int n = (int) Math.round((w + d) / d);
!       int m = (int) Math.round((h + d) / d);
        Vertex from = origin.copy();
        for (int k = 0; k < n; k++) {