[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Command.java, 1.71, 1.72 ParameterBlock.java, 1.15, 1.16

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

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

Modified Files:
	Command.java ParameterBlock.java 
Log Message:
create operations

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** Command.java	19 Feb 2008 12:44:32 -0000	1.71
--- Command.java	20 Feb 2008 13:48:28 -0000	1.72
***************
*** 1958,1964 ****
      public InitializeFrame(Container net) {
        parameters.put("net", net);
!       parameters.put("left", 0.05);
!       parameters.put("right", 0.05);
!       parameters.put("depth", 0.1);
      }
      
--- 1958,1964 ----
      public InitializeFrame(Container net) {
        parameters.put("net", net);
!       parameters.put("frame-width", 0.4);
!       parameters.put("interior-width", 0.1);
!       parameters.put("depth", 1.0);
      }
      
***************
*** 1967,1978 ****
      public void evaluate() {
        Container net = (Container) parameters.get("net");
!       double left = parameters.getDouble("left");
!       double right = parameters.getDouble("right");
        double depth = parameters.getDouble("depth");
        ParameterBlock block = new ParameterBlock();
!       block.put("left", left);
!       block.put("right", right);
        block.put("depth", depth);
!       net.setParameters(block); 
      }
    }
--- 1967,2001 ----
      public void evaluate() {
        Container net = (Container) parameters.get("net");
!       double frameWidth = parameters.getDouble("frame-width");
!       double interiorWidth = parameters.getDouble("interior-width");
        double depth = parameters.getDouble("depth");
        ParameterBlock block = new ParameterBlock();
!       block.put("frame-width", frameWidth);
!       block.put("interior-width", interiorWidth);
        block.put("depth", depth);
!       net.setParameters(block);
!       Collection<Surface> surfaces = net.getSurfaces();
!       Collection<Edge> edges = Surface.edges(surfaces);
!       Inverse inv = new Inverse(surfaces);
!       List<Edge> frame = new LinkedList();
!       List<Edge> interior = new LinkedList();
!       for (Edge current : edges) {
!         List<Surface> adjacent = inv.surfaces(current);
!         if (adjacent.size() == 1) {
!           frame.add(current);
!         } else {
!           interior.add(current);
!         }
!       }
!       for (Edge current : frame) {
!         ParameterBlock parms = new ParameterBlock();
!         parms.put("width", frameWidth);
!         current.setParameters(parms);
!       }
!       for (Edge current : interior) {
!         ParameterBlock parms = new ParameterBlock();
!         parms.put("width", interiorWidth);
!         current.setParameters(parms);
!       }
      }
    }
***************
*** 1996,2002 ****
        Container net = (Container) parameters.get("net");
        ParameterBlock block = net.getParameters();
!       double left = block.getDouble("left");
!       double right = block.getDouble("right");
!       double depth = block.getDouble("depth"); 
      }
    }
--- 2019,2023 ----
        Container net = (Container) parameters.get("net");
        ParameterBlock block = net.getParameters();
!       System.out.println("block " + block);
      }
    }

Index: ParameterBlock.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ParameterBlock.java	17 Dec 2007 13:09:17 -0000	1.15
--- ParameterBlock.java	20 Feb 2008 13:48:28 -0000	1.16
***************
*** 186,188 ****
--- 186,197 ----
      parameters.clear();
    }
+   
+   /**
+    * {@inheritDoc}
+    */
+   public String toString() {
+     StringBuffer buffer = new StringBuffer();
+     buffer.append("{parameters " + parameters + "}");
+     return buffer.toString();
+   }
  }