diff --git a/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/AbstractDataSet.java b/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/AbstractDataSet.java index c981f79d48e1e9710e5501cf924673ccc631aa62..25ffb50bca11ce928268a9b7a5423355e4ad326f 100644 --- a/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/AbstractDataSet.java +++ b/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/AbstractDataSet.java @@ -31,7 +31,7 @@ public abstract class AbstractDataSet implements DataSet { } protected void throwNotSupportMethod() throws Exception { - throw new Exception(ResourceBundleUtil.getResourceMessage("dataset.onlyread.error", "dataset.fields.notfound")); + throw new Exception(ResourceBundleUtil.getResourceMessage("dataset", "dataset.onlyread.error")); } protected Integer getColumn(String fieldName) { diff --git a/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/GroupDataSet.java b/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/GroupDataSet.java index c9b24fdb53d38a7ef864add56f76ad3074d1c505..de1f80fd03a7aacb1425dbb6ee420aee2ed77c83 100644 --- a/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/GroupDataSet.java +++ b/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/GroupDataSet.java @@ -82,15 +82,20 @@ public abstract class GroupDataSet extends DynamicDataSet { } StringBuilder sb = new StringBuilder(); + sb.append("----------------------------------------\n"); for (int k = 0; k < dataSets.size(); k++) { try { - for (Field f : dataSets.get(k).getFields()) { - sb.append(f.getName()).append(" "); - } - for (AggregateResult result : list) { - sb.append(result.getName()).append(" "); - } - sb.append("\n"); + if(k == 0) { + for (Field f : dataSets.get(k).getFields()) { + sb.append(f.getName()).append(" "); + } + for (AggregateResult result : list) { + sb.append(result.getName()).append(" "); + } + sb.append("\n"); + } + + sb.append("----------------------------------------\n"); for (int i = 0; i < dataSets.get(k).getRows(); i++) { for (int j = 0; j < dataSets.get(k).getColumns(); j++) { sb.append(dataSets.get(k).getData(getShowIndex(i), getShowIndex(j))).append(" "); @@ -105,7 +110,7 @@ public abstract class GroupDataSet extends DynamicDataSet { throw new RuntimeException(e); } } - + sb.append("----------------------------------------\n"); return sb.toString(); } diff --git a/org.tinygroup.tinyscript/src/test/resources/dataSetExample/intersect.ts b/org.tinygroup.tinyscript/src/test/resources/dataSetExample/intersect.ts index 78539cba5de680c243905a82ab8291224c502bf9..9ba5137ebdb7d86389c9825b21af689bceb6637d 100644 --- a/org.tinygroup.tinyscript/src/test/resources/dataSetExample/intersect.ts +++ b/org.tinygroup.tinyscript/src/test/resources/dataSetExample/intersect.ts @@ -1,28 +1,13 @@ dataSet1 = readTxt("/dataSetExample/data1.txt"); dataSet2 = readTxt("/dataSetExample/data2.txt"); result = dataSet1.intersect(dataSet2,()->{ return name+"|"+weight; }); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); println("================================================================"); result = dataSet1.intersect(dataSet2,["name","weight"]); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); println("================================================================"); result = dataSet1.intersect(dataSet2,"name"); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); diff --git a/org.tinygroup.tinyscript/src/test/resources/dataSetExample/subtract.ts b/org.tinygroup.tinyscript/src/test/resources/dataSetExample/subtract.ts index 5e7ba78e145d4d42654b7473b9d7ce9659d2db6a..3619bfae3c078d8ee21fe3e22c8f8e5f6c0c222f 100644 --- a/org.tinygroup.tinyscript/src/test/resources/dataSetExample/subtract.ts +++ b/org.tinygroup.tinyscript/src/test/resources/dataSetExample/subtract.ts @@ -1,28 +1,13 @@ dataSet1 = readTxt("/dataSetExample/data1.txt"); dataSet2 = readTxt("/dataSetExample/data2.txt"); result = dataSet1.subtract(dataSet2,()->{return name+"|"+weight;}); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); println("================================================================"); result = dataSet1.subtract(dataSet2,["name","weight"]); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); println("================================================================"); result = dataSet1.subtract(dataSet2,"name"); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); diff --git a/org.tinygroup.tinyscript/src/test/resources/dataSetExample/union.ts b/org.tinygroup.tinyscript/src/test/resources/dataSetExample/union.ts index 565acdb56727347b09745274a500103c462008d5..e38784a74393850b46e4f72888e1cb8080456cad 100644 --- a/org.tinygroup.tinyscript/src/test/resources/dataSetExample/union.ts +++ b/org.tinygroup.tinyscript/src/test/resources/dataSetExample/union.ts @@ -1,28 +1,13 @@ dataSet1 = readTxt("/dataSetExample/data1.txt"); dataSet2 = readTxt("/dataSetExample/data2.txt"); result = dataSet1.unite(dataSet2,()->{ return name+"|"+weight; }); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); println("================================================================"); result = dataSet1.unite(dataSet2,["name","weight"]); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); println("================================================================"); result = dataSet1.unite(dataSet2,"name"); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); diff --git a/org.tinygroup.tinyscript/src/test/resources/dataSetExample/xor.ts b/org.tinygroup.tinyscript/src/test/resources/dataSetExample/xor.ts index ae9d2399227ee60a6fa52ca8b08a08cb89c90365..c4da6d958e6aad7af82d77ac5290b48f2c8ef8d8 100644 --- a/org.tinygroup.tinyscript/src/test/resources/dataSetExample/xor.ts +++ b/org.tinygroup.tinyscript/src/test/resources/dataSetExample/xor.ts @@ -1,28 +1,13 @@ dataSet1 = readTxt("/dataSetExample/data1.txt"); dataSet2 = readTxt("/dataSetExample/data2.txt"); result = dataSet1.xor(dataSet2,()->{ return name+"|"+weight; }); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); println("================================================================"); result = dataSet1.xor(dataSet2,["name","weight"]); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); println("================================================================"); result = dataSet1.xor(dataSet2,"name"); -for(i = 1;i<=result.getRows();i++){ - for(j=1;j<=result.getColumns();j++){ - print(result[i][j]+" "); - } - println(); -} +println(result); diff --git a/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript b/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript index b99ac392ee55c61cbef24152e3d45296b19f563b..11d275a982922e3f696e658897a792b79a773914 100644 --- a/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript +++ b/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript @@ -31,7 +31,7 @@ printResult(money,days,ele)->{//对结果进行打印 } println("总价值:"+sumIncome(ele,temp,days)); }; -caculate(money,days)->{ +calculate(money,days)->{ investmentprogram = null;//投资方案结果 result = 0;//最大收益 list.combine((ele)->{ @@ -43,7 +43,7 @@ caculate(money,days)->{ }); return investmentprogram; }; -printResult(5000,80,caculate(5000,80)); -printResult(3000,30,caculate(3000,30)); -printResult(3000,60,caculate(3000,60)); -printResult(2000,20,caculate(2000,20)); \ No newline at end of file +printResult(5000,80,calculate(5000,80)); +printResult(3000,30,calculate(3000,30)); +printResult(3000,60,calculate(3000,60)); +printResult(2000,20,calculate(2000,20)); \ No newline at end of file