Commit: dfb9b32a32c3e6805ab8d29ab84610377ed86aaf - cit_bach (git)

Testcase generation tool for combinatorial interaction testing

Commit MetaInfo

• Revision: dfb9b32a32c3e6805ab8d29ab84610377ed86aaf (tree)
• Time: 2016-03-24 14:24:11
• Author: t-tutiya <tatsuhiro@ieee...>
• Commiter: t-tutiya

Log Message

Version 1.10
- Support arithmetic comparators: ===, !==, <, >, <=, >=.
- Memory usage reduction in BDD construction

Change Summary

• modified: src/v1/ConstraintHandler.java
• modified: src/v1/Generator.java

Incremental Difference

--- a/src/v1/ConstraintHandler.java
+++ b/src/v1/ConstraintHandler.java
@@ -169,6 +169,7 @@ class ConstraintHandler {
 		
 	private int extendBddConstraint(int constraint) {
 		int f = constraint;
+
 		for (VariableAndBDD p : parameters) {
 			int cube = p.var[0];
 			bdd.ref(cube);
@@ -179,12 +180,13 @@ class ConstraintHandler {
 			}
 			int tmp0 = bdd.ref(bdd.exists(f, cube));
 			int tmp = bdd.ref(bdd.and(tmp0, cube));
-			int newf = bdd.ref(bdd.or(f, tmp));
-
-			bdd.deref(cube);
+			bdd.deref(cube);		
 			bdd.deref(tmp0);
+
+			int newf = bdd.ref(bdd.or(f, tmp));
 			bdd.deref(tmp);
 			bdd.deref(f);
+
 			f = newf;
 		}
 		return f;
@@ -289,7 +291,6 @@ class ConstraintHandler {
 			i++;
 		}
 		
-		
 		/* for debug
 		 test.print(); for (int k = 0; k < res.length; k++)
 		 System.err.print(res[k] ? 1 : 0); System.err.println("<*");

--- a/src/v1/Generator.java
+++ b/src/v1/Generator.java
@@ -233,6 +233,8 @@ class Generator2 extends Generator {
 
 		boolean isSeedUsed = false;
 
+		// debug: System.err.print("seedrownum: " + seedrownum + "-> ");
+
 		// seedのコピー　制約を満たさなかったらエラー
 		if (seed.size() > 0 && seedrownum < seed.size()) {
 			isSeedUsed = true;
@@ -284,8 +286,12 @@ class Generator2 extends Generator {
 		res.numOfCoveredTuples = newtuples;
 		if (isSeedUsed) {
 			res.nextSeedRow = seedrownum + 1;
-		} else
+		} else {
 			res.nextSeedRow = seedrownum;
+		}
+		
+		// debug: System.err.println("next seed row:" + res.nextSeedRow);
+		
 		return res;
 	}
 
@@ -431,6 +437,9 @@ class Generator2 extends Generator {
 			for (int j = i + 1; j < numOfParameters; j++) {
 				if (tab.get(i, test.get(i), j, test.get(j)) == false) {
 					tab.set(i, test.get(i), j, test.get(j));
+					
+					// debug: System.err.println(i + ":" + test.get(i)+", " + j + ":" + test.get(j));
+					
 					numOfNewlyCoveredTuples++;
 				}
 			}