[Javabdd-checkins] JavaBDD/net/sf/javabdd BDDFactory.java,1.14,1.15 BDD.java,1.11,1.12

[John W. <joe...@us...>]

Update of /cvsroot/javabdd/JavaBDD/net/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15171/net/sf/javabdd

Modified Files:
	BDDFactory.java BDD.java 
Log Message:
Small cleanups.

Index: BDD.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDD.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BDD.java	24 May 2005 00:17:42 -0000	1.11
--- BDD.java	24 May 2005 18:24:38 -0000	1.12
***************
*** 1227,1241 ****
              return current;
          visited[r] = true;
!        
          // TODO: support labelling of vars.
          out.println(r+" [label=\""+this.var()+"\"];");
! 
          BDD l = this.low(), h = this.high();
!         Integer li = ((Integer) map.get(l));
          if (li == null) {
              map.put(l.id(), li = new Integer(++current));
          }
          int low = li.intValue();
!         Integer hi = ((Integer) map.get(h));
          if (hi == null) {
              map.put(h.id(), hi = new Integer(++current));
--- 1227,1241 ----
              return current;
          visited[r] = true;
!         
          // TODO: support labelling of vars.
          out.println(r+" [label=\""+this.var()+"\"];");
!         
          BDD l = this.low(), h = this.high();
!         Integer li = (Integer) map.get(l);
          if (li == null) {
              map.put(l.id(), li = new Integer(++current));
          }
          int low = li.intValue();
!         Integer hi = (Integer) map.get(h);
          if (hi == null) {
              map.put(h.id(), hi = new Integer(++current));

Index: BDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/net/sf/javabdd/BDDFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** BDDFactory.java	11 May 2005 01:24:54 -0000	1.14
--- BDDFactory.java	24 May 2005 18:24:38 -0000	1.15
***************
*** 533,536 ****
--- 533,538 ----
              root = b.ite(high, low);
              b.free();
+             if (low.isZero() || low.isOne()) low.free();
+             if (high.isZero() || high.isOne()) high.free();
  
              int hash = key % lh_nodenum;