[Javabdd-checkins] JavaBDD_tests/regression R2.java,1.1,1.2 R1.java,1.2,1.3

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

Update of /cvsroot/javabdd/JavaBDD_tests/regression
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15848/regression

Modified Files:
	R2.java R1.java 
Log Message:
Updates.


Index: R1.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD_tests/regression/R1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** R1.java	28 Jul 2004 09:38:34 -0000	1.2
--- R1.java	28 Jul 2004 10:20:53 -0000	1.3
***************
*** 5,12 ****
  
  import junit.framework.Assert;
- import junit.framework.TestCase;
  import org.sf.javabdd.BDD;
  import org.sf.javabdd.BDDDomain;
  import org.sf.javabdd.BDDFactory;
  
  /**
--- 5,12 ----
  
  import junit.framework.Assert;
  import org.sf.javabdd.BDD;
  import org.sf.javabdd.BDDDomain;
  import org.sf.javabdd.BDDFactory;
+ import bdd.BDDTestCase;
  
  /**
***************
*** 16,20 ****
   * @version $Id$
   */
! public class R1 extends TestCase {
      public static void main(String[] args) {
          junit.textui.TestRunner.run(R1.class);
--- 16,20 ----
   * @version $Id$
   */
! public class R1 extends BDDTestCase {
      public static void main(String[] args) {
          junit.textui.TestRunner.run(R1.class);
***************
*** 22,35 ****
      
      public void testR1() {
!         BDDFactory bdd = BDDFactory.init(1000, 1000);
!         BDDDomain d = bdd.extDomain(new int[] { 16 })[0];
!         BDD x = d.ithVar(6).orWith(d.ithVar(13));
!         BDD set = d.set();
!         double s1 = x.satCount(set);
!         bdd.setVarNum(20);
!         double s2 = x.satCount(set);
!         Assert.assertEquals(s1, s2, 0.00001);
!         x.free(); set.free();
!         bdd.done();
      }
  }
--- 22,36 ----
      
      public void testR1() {
!         while (hasNext()) {
!             BDDFactory bdd = nextFactory();
!             BDDDomain d = bdd.extDomain(new int[] { 16 })[0];
!             BDD x = d.ithVar(6).orWith(d.ithVar(13));
!             BDD set = d.set();
!             double s1 = x.satCount(set);
!             bdd.setVarNum(20);
!             double s2 = x.satCount(set);
!             Assert.assertEquals(bdd.toString(), s1, s2, 0.00001);
!             x.free(); set.free();
!         }
      }
  }

Index: R2.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD_tests/regression/R2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** R2.java	28 Jul 2004 09:58:21 -0000	1.1
--- R2.java	28 Jul 2004 10:20:53 -0000	1.2
***************
*** 4,12 ****
  package regression;
  
  import org.sf.javabdd.BDD;
- import org.sf.javabdd.BDDDomain;
  import org.sf.javabdd.BDDFactory;
! import junit.framework.Assert;
! import junit.framework.TestCase;
  
  /**
--- 4,11 ----
  package regression;
  
+ import junit.framework.Assert;
  import org.sf.javabdd.BDD;
  import org.sf.javabdd.BDDFactory;
! import bdd.BDDTestCase;
  
  /**
***************
*** 16,20 ****
   * @version $Id$
   */
! public class R2 extends TestCase {
      public static void main(String[] args) {
          junit.textui.TestRunner.run(R2.class);
--- 15,19 ----
   * @version $Id$
   */
! public class R2 extends BDDTestCase {
      public static void main(String[] args) {
          junit.textui.TestRunner.run(R2.class);
***************
*** 22,35 ****
      
      public void testR2() {
!         BDDFactory bdd = BDDFactory.init(1000, 1000);
!         BDD zero = bdd.zero();
!         BDD one = bdd.one();
!         Assert.assertTrue(zero.isZero());
!         Assert.assertTrue(one.isOne());
!         BDD s0 = zero.support();
!         BDD s1 = one.support();
!         Assert.assertTrue(s0.isOne());
!         Assert.assertTrue(s1.isOne());
!         bdd.done();
      }
  }
--- 21,37 ----
      
      public void testR2() {
!         while (hasNext()) {
!             BDDFactory bdd = nextFactory();
!             BDD zero = bdd.zero();
!             BDD one = bdd.one();
!             Assert.assertTrue(bdd.toString(), zero.isZero());
!             Assert.assertTrue(bdd.toString(), one.isOne());
!             BDD s0 = zero.support();
!             BDD s1 = one.support();
!             Assert.assertTrue(bdd.toString(), s0.isOne());
!             Assert.assertTrue(bdd.toString(), s1.isOne());
!             zero.free(); one.free();
!             s0.free(); s1.free();
!         }
      }
  }