• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Testcase generation tool for combinatorial interaction testing


Commit MetaInfo

Révision694443ebbc9f1805666b68e0c9199babaf4b654d (tree)
l'heure2017-05-15 16:51:25
Auteurt-tutiya <tatsuhiro@ieee...>
Commitert-tutiya

Message de Log

I have copied the CIT-bach project.

Change Summary

Modification

--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22 <projectDescription>
3- <name>cit_bach</name>
3+ <name>IPOG_bach</name>
44 <comment></comment>
55 <projects>
66 </projects>
--- a/inputsamples/arith1.txt
+++ b/inputsamples/arith1.txt
@@ -16,8 +16,9 @@ P10 (1 2 3 4)
1616
1717 # 制約(禁則)を列挙
1818
19-(or
20- (> [P1] [P2]) (> [P3] [P4]) (> [P5] [P6]) (> [P7] [P8]) (> [P9] [P2])
19+(and
20+ (< [P1] [P2]) (> [P3] [P4]) (<= [P5] [P6]) (>= [P7] [P8])
21+ (=== [P9] 2.0) (!== [P10] 3.0)
2122 )
2223
2324 # 単項演算子:not
@@ -25,5 +26,9 @@ P10 (1 2 3 4)
2526 # 3項演算子:ite (if-then-elseの意味)
2627 # 多項演算子:or, and
2728
28-# 算術演算子(因子の値に対する演算.結果はブール値)
29-# ==, <>
\ No newline at end of file
29+# 比較演算子(因子の値に対する演算.結果はブール値)
30+# ==, <>
31+
32+# 算術演算子 (double型に変換)
33+# ===, !==, <, >, <=, >=
34+
--- a/src/v1/ConstraintHandler.java
+++ b/src/v1/ConstraintHandler.java
@@ -3,6 +3,7 @@ package v1;
33 import jdd.bdd.*;
44
55 import java.util.ArrayList;
6+import java.util.Collections;
67 import java.util.List;
78 import java.util.TreeSet;
89
@@ -170,7 +171,14 @@ class ConstraintHandler {
170171 private int extendBddConstraint(int constraint) {
171172 int f = constraint;
172173
174+ int count = 0;
175+
176+ long start = System.currentTimeMillis();
177+
178+ Collections.reverse(parameters);
179+
173180 for (VariableAndBDD p : parameters) {
181+ // System.err.println(count++);
174182 int cube = p.var[0];
175183 bdd.ref(cube);
176184 for (int i = 1; i < p.var.length; i++) {
@@ -189,6 +197,13 @@ class ConstraintHandler {
189197
190198 f = newf;
191199 }
200+ //
201+
202+ Collections.reverse(parameters);
203+
204+// long end = System.currentTimeMillis();
205+// System.err.println((end - start) + "ms");
206+
192207 return f;
193208 }
194209
--- a/src/v1/Main.java
+++ b/src/v1/Main.java
@@ -14,7 +14,7 @@ public class Main {
1414 static final int MAX_LEVEL = 63;
1515
1616 static final int MAX_ITERATIONS = 100000;
17- static final int MAX_STRENGTH = 5;
17+ static final int MAX_STRENGTH = 5;
1818 static final int Max_RandomSeed = 65535;
1919 // static final int Max_RandomSeed = 10;
2020
@@ -29,6 +29,8 @@ public class Main {
2929 // Start the whole process
3030 public static void main(String[] args) {
3131
32+ long start = System.currentTimeMillis();
33+
3234 try {
3335 // コマンド引数処理
3436 String errorMessage = processCommandArgument(args);
@@ -141,6 +143,9 @@ public class Main {
141143 Error.printError(Main.language == Main.Language.JP ? "プログラムが異常終了しました."
142144 : "Abnormal termination");
143145 }
146+
147+// long end = System.currentTimeMillis();
148+// System.err.println("time: " + (end - start) + "ms");
144149 }
145150
146151 // コマンド引数処理
@@ -152,7 +157,7 @@ public class Main {
152157 // policyの表示
153158 if (args.length == 1 && args[0].equals("-policy")) {
154159 System.out
155- .println("This software (CIT-BACH 1.02) is distributed under the zlib license.\n"
160+ .println("This software (CIT-BACH 1.1) is distributed under the zlib license.\n"
156161 + "The software contains Java classes from JDD, a Java BDD library "
157162 + "developed by Arash Vahidi.\n"
158163 + "JDD is free software distributed under the zlib license.\n"