From 23890c623774fb2fe5531efcb6c91b7d5502fbb8 Mon Sep 17 00:00:00 2001 From: fujie <405295521@qq.com> Date: Thu, 26 Oct 2017 20:50:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=84=9A=E6=9C=AC=E6=B5=8B=E8=AF=95=E5=BA=8F?= =?UTF-8?q?=E8=A1=A8=E8=BE=93=E5=87=BA=E6=94=B9=E4=B8=BA=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E4=BD=BF=E7=94=A8tostring.2.=E4=BF=AE=E5=A4=8D=E5=BA=8F?= =?UTF-8?q?=E8=A1=A8=E5=BC=82=E5=B8=B8=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tinyscript/dataset/AbstractDataSet.java | 2 +- .../tinyscript/dataset/GroupDataSet.java | 21 ++++++++++++------- .../resources/dataSetExample/intersect.ts | 21 +++---------------- .../test/resources/dataSetExample/subtract.ts | 21 +++---------------- .../test/resources/dataSetExample/union.ts | 21 +++---------------- .../src/test/resources/dataSetExample/xor.ts | 21 +++---------------- .../resources/example/financing.tinyscript | 10 ++++----- 7 files changed, 31 insertions(+), 86 deletions(-) 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 c981f79..25ffb50 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 c9b24fd..de1f80f 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 78539cb..9ba5137 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 5e7ba78..3619bfa 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 565acdb..e38784a 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 ae9d239..c4da6d9 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 b99ac39..11d275a 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 -- Gitee