|
@@ -20,21 +20,23 @@ public class Compose {
|
|
|
|
|
|
String dataUrl = Messages.getString("Compose.data");
|
|
String dataUrl = Messages.getString("Compose.data");
|
|
String resultUrl = "data/result.txt";
|
|
String resultUrl = "data/result.txt";
|
|
- String result = null;
|
|
|
|
|
|
+ String result = "";
|
|
|
|
|
|
TextHelper textHelper = new TextHelper();
|
|
TextHelper textHelper = new TextHelper();
|
|
ArrayList<String> allChinese = textHelper.readTextByWord(dataUrl);
|
|
ArrayList<String> allChinese = textHelper.readTextByWord(dataUrl);
|
|
- ArrayList<String> allChineseName = textHelper.readTextByWord(dataUrl);
|
|
|
|
|
|
+ ArrayList<String> allChineseName = new ArrayList<String>();
|
|
// 两两组合
|
|
// 两两组合
|
|
- for (int i = 0; i < 20; i++) {
|
|
|
|
- for (int j = i + 1; j < allChinese.size() - 1; j++) {
|
|
|
|
|
|
+ for (int i = 0; i < allChinese.size(); i++) {
|
|
|
|
+ for (int j = i + 1; j < allChinese.size(); j++) {
|
|
allChineseName.add(allChinese.get(i) + allChinese.get(j));
|
|
allChineseName.add(allChinese.get(i) + allChinese.get(j));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 打印输出
|
|
// 打印输出
|
|
for (int k = 0; k < allChineseName.size(); k++) {
|
|
for (int k = 0; k < allChineseName.size(); k++) {
|
|
- result += allChineseName.get(k);
|
|
|
|
|
|
+ // result += allChineseName.get(k)+
|
|
|
|
+ // System.getProperty("line.separator");
|
|
|
|
+ result += allChineseName.get(k) + " ";
|
|
}
|
|
}
|
|
- textHelper.writeText(resultUrl, result);
|
|
|
|
|
|
+ TextHelper.writeText(resultUrl, result);
|
|
}
|
|
}
|
|
}
|
|
}
|