OSDN > Developer > tallman > Chambre > cit_bach > Commit

CIT-BACH
Fork

Commit

Corrected CVS processing. (It is only used for processing a seeding
file.)

--- a/src/v1/Generator.java

+++ b/src/v1/Generator.java

		@@ -134,7 +134,7 @@ class Generator2 extends Generator {
134	134
135	135	// for regression testing it should be reduced to 1
136	136	final int NumOfIterationForEachTest = 20;
137		-// final int NumOfIterationForEachTest = 1;
	137	+ // final int NumOfIterationForEachTest = 1;
138	138
139	139	Generator2(ParameterModel parametermodel, GList groupList,
140	140	ConstraintHandler constrainthandler, List<Testcase> seed,

--- a/src/v1/Inputer.java

+++ b/src/v1/Inputer.java

		@@ -42,17 +42,17 @@ public class Inputer {
42	42	while ((row = parseCSVRow(reader)) != null) {
43	43	// TODO debug
44	44	// debug
45		- /*
46		- * System.out.print("seed:"); for (String str: row) {
47		- * System.out.print(str + "\t"); } System.out.println();
48		- */
	45	+ /**
	46	+ System.out.print("seed:"); for (String str: row) {
	47	+ System.out.print(str + "\t"); } System.out.println();
	48	+
49	49
50		- /*
51		- * System.err.print(row.size() +": "); for (String str: row) {
52		- * System.err.print(str + ","); } System.err.println();
53		- */
	50	+
	51	+ System.err.print(row.size() +": "); for (String str: row) {
	52	+ System.err.print(str + ","); } System.err.println();
	53	+
54	54
55		- /*
	55	+
56	56	* if (isValueConsistent(row, inputfiledata) == false) {
57	57	* Error.printError("seedファイルの値の記述に誤りがあります"); return null; }
58	58	*/

		@@ -142,15 +142,18 @@ public class Inputer {
142	142	// line = line.replaceAll("#", ",#,");
143	143	// #以降を消去
144	144	line = line.replaceAll("#.*", "");
	145	+
145	146	// ,から始まる場合，行頭にスペースを入れる
146	147	// line = line.replaceAll(",", " ,");
	148	+ // ,の前後にスペースを入れる．2016/2/19以下を追加
	149	+ line = line.replaceAll(",", " , ");
147	150	StringTokenizer st = new StringTokenizer(line, ",");
148	151	while (st.hasMoreTokens()) {
149	152	String token = st.nextToken();
150	153	token = token.trim();
151	154	// if (token.equals("#"))
152	155	// break;
153		- token = token.trim();
	156	+ // token = token.trim(); unnecessary
154	157	tokenList.add(token);
155	158	}
156	159	} catch (IOException e) {