[Javabdd-checkins] JavaBDD/org/sf/javabdd JFactory.java,1.6,1.7 CALFactory.java,1.4,1.5 BuDDyFactory

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	JFactory.java CALFactory.java BuDDyFactory.java 
	TypedBDDFactory.java TestBDDFactory.java JDDFactory.java 
	CUDDFactory.java 
Log Message:
Make inner classes private.

Index: TestBDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/TestBDDFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TestBDDFactory.java	2 Aug 2004 20:00:58 -0000	1.10
--- TestBDDFactory.java	2 Aug 2004 20:20:53 -0000	1.11
***************
*** 59,63 ****
      }

!     class TestBDD extends BDD {

          BDD b1, b2;
--- 59,63 ----
      }

!     private class TestBDD extends BDD {

          BDD b1, b2;
***************
*** 863,867 ****
      }

!     static class TestBDDPairing extends BDDPairing {

          BDDPairing b1, b2;
--- 863,867 ----
      }

!     private static class TestBDDPairing extends BDDPairing {

          BDDPairing b1, b2;
***************
*** 898,902 ****
      }

!     class TestBDDDomain extends BDDDomain {

          TestBDDDomain(int a, long b) {
--- 898,902 ----
      }

!     private class TestBDDDomain extends BDDDomain {

          TestBDDDomain(int a, long b) {
***************
*** 913,917 ****
      }

!     class TestBDDBitVector extends BDDBitVector {

          TestBDDBitVector(int a) {
--- 913,917 ----
      }

!     private class TestBDDBitVector extends BDDBitVector {

          TestBDDBitVector(int a) {

Index: JFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JFactory.java	2 Aug 2004 19:57:30 -0000	1.6
--- JFactory.java	2 Aug 2004 20:20:53 -0000	1.7
***************
*** 44,48 ****
       * Wrapper for the BDD index number used internally in the representation.
       */
!     class bdd extends BDD {
          int _index;

--- 44,48 ----
       * Wrapper for the BDD index number used internally in the representation.
       */
!     private class bdd extends BDD {
          int _index;

***************
*** 531,540 ****
      }

!     abstract static class BddCacheData {
          int a, b, c;
          abstract BddCacheData copy();
      }

!     static class BddCacheDataI extends BddCacheData {
          int res;
          BddCacheData copy() {
--- 531,540 ----
      }

!     private abstract static class BddCacheData {
          int a, b, c;
          abstract BddCacheData copy();
      }

!     private static class BddCacheDataI extends BddCacheData {
          int res;
          BddCacheData copy() {
***************
*** 548,552 ****
      }

!     static class BddCacheDataD extends BddCacheData {
          double dres;
          BddCacheData copy() {
--- 548,552 ----
      }

!     private static class BddCacheDataD extends BddCacheData {
          double dres;
          BddCacheData copy() {
***************
*** 560,564 ****
      }

!     static class BddCache {
          BddCacheData table[];
          int tablesize;
--- 560,564 ----
      }

!     private static class BddCache {
          BddCacheData table[];
          int tablesize;
***************
*** 575,579 ****
      }

!     static class bddCacheStat {
          int uniqueAccess;
          int uniqueChain;
--- 575,579 ----
      }

!     public static class bddCacheStat {
          int uniqueAccess;
          int uniqueChain;
***************
*** 597,601 ****
      }

!     static class JavaBDDException extends BDDException {
          public JavaBDDException(int x) {
              super(errorstrings[-x]);
--- 597,601 ----
      }

!     private static class JavaBDDException extends BDDException {
          public JavaBDDException(int x) {
              super(errorstrings[-x]);
***************
*** 2380,2384 ****
      }

!     static class bddGbcStat {
          int nodes;
          int freenodes;
--- 2380,2384 ----
      }

!     public static class bddGbcStat {
          int nodes;
          int freenodes;

Index: TypedBDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/TypedBDDFactory.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TypedBDDFactory.java	2 Aug 2004 20:01:45 -0000	1.17
--- TypedBDDFactory.java	2 Aug 2004 20:20:53 -0000	1.18
***************
*** 420,424 ****
      };

!     class TypedBDD extends BDD {

          final BDD bdd;
--- 420,430 ----
      };

!     /**
!      * A BDD with types (domains) attached to it.
!      * 
!      * @author jwhaley
!      * @version $Id$
!      */
!     public class TypedBDD extends BDD {

          final BDD bdd;
***************
*** 1001,1005 ****
      }

!     class TypedBDDDomain extends BDDDomain {

          BDDDomain domain;
--- 1007,1011 ----
      }

!     private class TypedBDDDomain extends BDDDomain {

          BDDDomain domain;
***************
*** 1081,1085 ****
      }

!     static class TypedBDDPairing extends BDDPairing {

          final Map domMap;
--- 1087,1091 ----
      }

!     private static class TypedBDDPairing extends BDDPairing {

          final Map domMap;

Index: JDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/JDDFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JDDFactory.java	12 Jul 2004 07:08:58 -0000	1.2
--- JDDFactory.java	2 Aug 2004 20:20:53 -0000	1.3
***************
*** 35,39 ****
       * Wrapper for the BDD index number used internally in the representation.
       */
!     class bdd extends BDD {
          int _index;

--- 35,39 ----
       * Wrapper for the BDD index number used internally in the representation.
       */
!     private class bdd extends BDD {
          int _index;

Index: BuDDyFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/BuDDyFactory.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** BuDDyFactory.java	28 Mar 2004 21:49:47 -0000	1.33
--- BuDDyFactory.java	2 Aug 2004 20:20:53 -0000	1.34
***************
*** 477,481 ****
       * An implementation of a BDD class, used by the BuDDy interface.
       */
!     static class BuDDyBDD extends BDD {

          /** The value used by the BDD library. */
--- 477,481 ----
       * An implementation of a BDD class, used by the BuDDy interface.
       */
!     private static class BuDDyBDD extends BDD {

          /** The value used by the BDD library. */
***************
*** 902,906 ****
      }

!     static class BuDDyBDDWithFinalizer extends BuDDyBDD {

          protected BuDDyBDDWithFinalizer(int id) {
--- 902,906 ----
      }

!     private static class BuDDyBDDWithFinalizer extends BuDDyBDD {

          protected BuDDyBDDWithFinalizer(int id) {
***************
*** 930,934 ****
       * An implementation of a BDDDomain, used by the BuDDy interface.
       */
!     static class BuDDyBDDDomain extends BDDDomain {

          private BuDDyBDDDomain(int a, long b) {
--- 930,934 ----
       * An implementation of a BDDDomain, used by the BuDDy interface.
       */
!     private static class BuDDyBDDDomain extends BDDDomain {

          private BuDDyBDDDomain(int a, long b) {
***************
*** 946,950 ****
       * An implementation of a BDDPairing, used by the BuDDy interface.
       */
!     static class BuDDyBDDPairing extends BDDPairing {

          private long _ptr;
--- 946,950 ----
       * An implementation of a BDDPairing, used by the BuDDy interface.
       */
!     private static class BuDDyBDDPairing extends BDDPairing {

          private long _ptr;
***************
*** 1023,1027 ****
       * An implementation of a BDDBitVector, used by the BuDDy interface.
       */
!     static class BuDDyBDDBitVector extends BDDBitVector {

          private BuDDyBDDBitVector(int a) {
--- 1023,1027 ----
       * An implementation of a BDDBitVector, used by the BuDDy interface.
       */
!     private static class BuDDyBDDBitVector extends BDDBitVector {

          private BuDDyBDDBitVector(int a) {
***************
*** 1036,1070 ****
      }

-     public static void main(String[] args) {
-         BDDFactory bdd = init(1000000, 100000);
-         
-         BDDDomain[] doms = bdd.extDomain(new int[] {50, 10, 15, 20, 15});
-         
-         BDD b = bdd.one();
-         for (int i=0; i<doms.length-1; ++i) {
-             b.andWith(doms[i].ithVar(i));
-         }
-         
-         for (int i=0; i<bdd.numberOfDomains(); ++i) {
-             BDDDomain d = bdd.getDomain(i);
-             int[] ivar = d.vars();
-             System.out.print("Domain #"+i+":");
-             for (int j=0; j<ivar.length; ++j) {
-                 System.out.print(' ');
-                 System.out.print(j);
-                 System.out.print(':');
-                 System.out.print(ivar[j]);
-             }
-             System.out.println();
-         }
-         
-         BDDPairing p = bdd.makePair(doms[2], doms[doms.length-1]);
-         System.out.println("Pairing: "+p);
-         
-         System.out.println("Before replace(): "+b);
-         BDD c = b.replace(p);
-         System.out.println("After replace(): "+c);
-         
-         bdd.printTable(c);
-     }
  }
--- 1036,1038 ----

Index: CUDDFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/CUDDFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CUDDFactory.java	21 Jun 2004 17:35:57 -0000	1.16
--- CUDDFactory.java	2 Aug 2004 20:20:53 -0000	1.17
***************
*** 389,393 ****
       * An implementation of a BDD class, used by the CUDD interface.
       */
!     static class CUDDBDD extends BDD {

          /** The pointer used by the BDD library. */
--- 389,393 ----
       * An implementation of a BDD class, used by the CUDD interface.
       */
!     private static class CUDDBDD extends BDD {

          /** The pointer used by the BDD library. */
***************
*** 775,779 ****
       * An implementation of a BDDDomain, used by the CUDD interface.
       */
!     static class CUDDBDDDomain extends BDDDomain {

          private CUDDBDDDomain(int index, long range) {
--- 775,779 ----
       * An implementation of a BDDDomain, used by the CUDD interface.
       */
!     private static class CUDDBDDDomain extends BDDDomain {

          private CUDDBDDDomain(int index, long range) {
***************
*** 793,797 ****
       * An implementation of a BDDPairing, used by the CUDD interface.
       */
!     static class CUDDBDDPairing extends BDDPairing {

          long _ptr;
--- 793,797 ----
       * An implementation of a BDDPairing, used by the CUDD interface.
       */
!     private static class CUDDBDDPairing extends BDDPairing {

          long _ptr;
***************
*** 844,848 ****
       * An implementation of a BDDBitVector, used by the CUDD interface.
       */
!     static class CUDDBDDBitVector extends BDDBitVector {

          private CUDDBDDBitVector(int a) {
--- 844,848 ----
       * An implementation of a BDDBitVector, used by the CUDD interface.
       */
!     private static class CUDDBDDBitVector extends BDDBitVector {

          private CUDDBDDBitVector(int a) {

Index: CALFactory.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/CALFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CALFactory.java	28 Jul 2004 03:39:55 -0000	1.4
--- CALFactory.java	2 Aug 2004 20:20:53 -0000	1.5
***************
*** 389,393 ****
       * An implementation of a BDD class, used by the CAL interface.
       */
!     static class CALBDD extends BDD {

          /** The pointer used by the BDD library. */
--- 389,393 ----
       * An implementation of a BDD class, used by the CAL interface.
       */
!     private static class CALBDD extends BDD {

          /** The pointer used by the BDD library. */
***************
*** 772,776 ****
       * An implementation of a BDDDomain, used by the CAL interface.
       */
!     static class CALBDDDomain extends BDDDomain {

          private CALBDDDomain(int index, long range) {
--- 772,776 ----
       * An implementation of a BDDDomain, used by the CAL interface.
       */
!     private static class CALBDDDomain extends BDDDomain {

          private CALBDDDomain(int index, long range) {
***************
*** 790,794 ****
       * An implementation of a BDDPairing, used by the CAL interface.
       */
!     static class CALBDDPairing extends BDDPairing {

          long _ptr;
--- 790,794 ----
       * An implementation of a BDDPairing, used by the CAL interface.
       */
!     private static class CALBDDPairing extends BDDPairing {

          long _ptr;
***************
*** 841,845 ****
       * An implementation of a BDDBitVector, used by the CAL interface.
       */
!     static class CALBDDBitVector extends BDDBitVector {

          private CALBDDBitVector(int a) {
--- 841,845 ----
       * An implementation of a BDDBitVector, used by the CAL interface.
       */
!     private static class CALBDDBitVector extends BDDBitVector {

          private CALBDDBitVector(int a) {
***************
*** 851,889 ****
      }

-     public static void main(String[] args) {
-         BDDFactory bdd = init(1000000, 100000);
-         
-         System.out.println("One: "+CALFactory.one);
-         System.out.println("Zero: "+CALFactory.zero);
-         
-         BDDDomain[] doms = bdd.extDomain(new int[] {50, 10, 15, 20, 15});
-         
-         BDD b = bdd.one();
-         for (int i=0; i<doms.length-1; ++i) {
-             b.andWith(doms[i].ithVar(i));
-         }
-         
-         for (int i=0; i<bdd.numberOfDomains(); ++i) {
-             BDDDomain d = bdd.getDomain(i);
-             int[] ivar = d.vars();
-             System.out.print("Domain #"+i+":");
-             for (int j=0; j<ivar.length; ++j) {
-                 System.out.print(' ');
-                 System.out.print(j);
-                 System.out.print(':');
-                 System.out.print(ivar[j]);
-             }
-             System.out.println();
-         }
-         
-         BDDPairing p = bdd.makePair(doms[2], doms[doms.length-1]);
-         System.out.println("Pairing: "+p);
-         
-         System.out.println("Before replace(): "+b);
-         BDD c = b.replace(p);
-         System.out.println("After replace(): "+c);
-         
-         c.printDot();
-     }
- 
  }
--- 851,853 ----

[Javabdd-checkins] JavaBDD/org/sf/javabdd JFactory.java,1.6,1.7 CALFactory.java,1.4,1.5 BuDDyFactory

[Javabdd-checkins] JavaBDD/org/sf/javabdd JFactory.java,1.6,1.7 CALFactory.java,1.4,1.5 BuDDyFactory.java,1.33,1.34 TypedBDDFactory.java,1.17,1.18 TestBDDFactory.java,1.10,1.11 JDDFactory.java,1.2,1.3 CUDDFactory.java,1.16,1.17